more normal configure options for gtk and qt4

diff --git a/arch/gentoo/yoink.ebuild b/arch/gentoo/yoink.ebuild
index a7394b310cd3deef3130e32b952c103dbd51a76d..16781c7a5343d1113e5205556514e1a01185956c 100644 (file)
--- a/arch/gentoo/yoink.ebuild
+++ b/arch/gentoo/yoink.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.dogcows.com/yoink/${P}.tar.bz2
 
 LICENSE="BSD-2 BSD LGPL-2.1 ZLIB"
 SLOT="0"
 
 LICENSE="BSD-2 BSD LGPL-2.1 ZLIB"
 SLOT="0"

-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"

 IUSE="debug double-precision gtk qt4 threads"
 
 RDEPEND="dev-lang/lua
 IUSE="debug double-precision gtk qt4 threads"
 
 RDEPEND="dev-lang/lua


@@ -28,15 +28,8 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
 src_prepare() {
        dev-util/pkgconfig"
 
 src_prepare() {

-       sed -i \
-               -e "/apps/d" \
-               -e "/pixmap/d" \
-               data/Makefile.am \
-               || die "sed failed"
-       sed -i \
-               -e "/man/d" \
-               doc/Makefile.am \
-               || die "sed failed"
+       sed -i -e "/apps/d" -e "/pixmap/d" data/Makefile.am || die "sed failed"
+       sed -i -e "/man/d" Makefile.am || die "sed failed"

 
        eautoreconf
 }
 
        eautoreconf
 }


@@ -46,9 +39,9 @@ src_configure() {
                --disable-dependency-tracking \
                $(use_enable debug) \
                $(use_enable double-precision) \
                --disable-dependency-tracking \
                $(use_enable debug) \
                $(use_enable double-precision) \

-               $(use_enable gtk) \
-               $(use_enable qt4) \
-               $(use_enable threads)
+               $(use_enable threads) \
+               $(use_with gtk) \
+               $(use_with qt4)

 }
 
 src_install() {
 }
 
 src_install() {

diff --git a/configure.ac b/configure.ac
index a05e8236a4bc2301b40a19d1249420b10cc1e733..da42bf063ef7d28ea94fcbb7df8d1b22d48a8ed6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,11 +77,17 @@ AC_ARG_ENABLE([threads],
                          [threads=$enableval],
                          [threads=no])
 
                          [threads=$enableval],
                          [threads=no])
 

-AC_ARG_WITH([gui-toolkit],
-                       [AS_HELP_STRING([--with-gui-toolkit=ARG],
-                                                       [possible values: none (default), gtk, qt4])],
-                       [gui_toolkit=$withval],
-                       [gui_toolkit=none])
+AC_ARG_WITH([gtk],
+                       [AS_HELP_STRING([--with-gtk],
+                                                       [use gtk2 modal dialogs])],
+                       [gtk=$withval],
+                       [gtk=no])
+
+AC_ARG_WITH([qt4],
+                       [AS_HELP_STRING([--with-qt4],
+                                                       [use qt4 modal dialogs; overridden by --with-gtk])],
+                       [qt4=$withval],
+                       [qt4=no])

 
 
 if test x$debug = xyes
 
 
 if test x$debug = xyes


@@ -121,11 +127,11 @@ then
                          [Define to 1 if you want to use threads when applicable.])
 fi
 
                          [Define to 1 if you want to use threads when applicable.])
 fi
 

-if test x$gui_toolkit = xgtk
+if test x$gtk = xyes

 then
        AC_DEFINE([USE_GTK], 1,
                          [Define to 1 if you want to use GTK+ modal dialogs.])
 then
        AC_DEFINE([USE_GTK], 1,
                          [Define to 1 if you want to use GTK+ modal dialogs.])

-elif test x$gui_toolkit = xqt4
+elif test x$qt4 = xyes

 then
        AC_DEFINE([USE_QT4], 1,
                          [Define to 1 if you want to use QT4 modal dialogs.])
 then
        AC_DEFINE([USE_QT4], 1,
                          [Define to 1 if you want to use QT4 modal dialogs.])


@@ -265,7 +271,7 @@ PKG_CHECK_MODULES([LUA], [lua],
                                   AC_MSG_WARN([Missing liblua ($website)])])
 
 ##### GTK+ 2.0 #####
                                   AC_MSG_WARN([Missing liblua ($website)])])
 
 ##### GTK+ 2.0 #####

-if test x$gui_toolkit = xgtk
+if test x$gtk = xyes

 then
        website="http://www.gtk.org/"
        PKG_CHECK_MODULES([GTK], [gtk+-2.0],
 then
        website="http://www.gtk.org/"
        PKG_CHECK_MODULES([GTK], [gtk+-2.0],


@@ -277,7 +283,7 @@ then
 fi
 
 ##### QT4 #####
 fi
 
 ##### QT4 #####

-if test x$gui_toolkit = xqt4
+if test x$qt4 = xyes

 then
        website="http://qt.nokia.com/"
        PKG_CHECK_MODULES([QT4], [QtGui],
 then
        website="http://qt.nokia.com/"
        PKG_CHECK_MODULES([QT4], [QtGui],

diff --git a/src/Makefile.am b/src/Makefile.am
index 9bbd7e8282833bf4674252f583e11a8430f208dd..fa6c9814273a2e3e3adc62eacae71a6a217637b0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -133,6 +133,6 @@ yoink$(EXEEXT): $(yoink_OBJECTS) $(yoink_DEPENDENCIES)
                sh $(top_srcdir)/link.sh
 
 clean-local:
                sh $(top_srcdir)/link.sh
 
 clean-local:

-       rm -rf .link
+       rm -f .link/*

 endif
 
 endif