revert broken build files

[chaz/yoink] / configure.ac

diff --git a/configure.ac b/configure.ac
index f75ce600c01e9e91031fce1641953c3cdc6d8648..0f46ef53253e2a542801618c61287d3943f8413e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,10 @@ AC_PROG_INSTALL
 AC_PROG_RANLIB
 AM_PROG_CC_C_O
 
+PKG_PROG_PKG_CONFIG
+
+AC_PATH_PROGS([DOXYGEN], [doxygen])
+AC_SUBST(DOXYGEN)
 
 #
 # Configure platform-specific stuff.
@@ -55,8 +59,6 @@ case "${host}" in
        ;;
        *-linux-gnu*)
                LINUX=yes
-               AC_PATH_PROGS([RPMBUILD], [rpmbuild])
-               AC_SUBST(RPMBUILD)
        ;;
 esac
 
@@ -93,6 +95,16 @@ AC_ARG_ENABLE([threads],
                          [threads=$enableval],
                          [threads=no])
 
+AC_ARG_ENABLE([gtk],
+                         [  --enable-gtk            enable GTK+ info/warning dialogs],
+                         [gtk=$enableval],
+                         [gtk=no])
+
+AC_ARG_ENABLE([qt4],
+                         [  --enable-qt4            enable QT info/warning dialogs],
+                         [qt4=$enableval],
+                         [qt4=no])
+
 AC_ARG_WITH([log-level],
                        [AS_HELP_STRING([--with-log-level=NUM],
                                                        [0, none... 1, errors... 4, everything (default: 3)])],
@@ -135,6 +147,18 @@ then
                          [Define to 1 if you want to use threads for parallel tasks.])
 fi
 
+if test x$gtk = xyes
+then
+       AC_DEFINE([USE_GTK], 1,
+                         [Define to 1 if you want to use GTK+ info/error dialogs.])
+else
+if test x$qt4 = xyes
+then
+       AC_DEFINE([USE_QT4], 1,
+                         [Define to 1 if you want to use QT info/error dialogs.])
+fi
+fi
+
 AC_DEFINE_UNQUOTED([YOINK_LOGLEVEL], [$log_level],
                                   [Define to detail level of logging.])
 
@@ -148,7 +172,7 @@ if test x$WIN32 = xyes
 then
        DATADIR="data"
 else
-       eval eval DATADIR="${datadir}/yoink"
+       eval eval DATADIR="${datadir}/$PACKAGE"
 fi
 
 AC_SUBST([DATADIR])
@@ -280,6 +304,30 @@ AC_SEARCH_LIBS([lua_load], [lua],,
                           [missing=yes
                                echo "***** Missing liblua ($website) *****"])
 
+if test x$gtk = xyes
+then
+       ##### GTK+ 2.0 #####
+       website="http://www.gtk.org/"
+       PKG_CHECK_MODULES([GTK], [gtk+-2.0],
+                                         [LIBS="$LIBS $GTK_LIBS"
+                                          CFLAGS="$CFLAGS $GTK_CFLAGS"
+                                          CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"],
+                                         [missing=yes
+                                          echo "***** Missing GTK+-2.0 ($website) *****"])
+fi
+
+if test x$qt4 = xyes
+then
+       ##### QT4 #####
+       website="http://qt.nokia.com/"
+       PKG_CHECK_MODULES([QT], [QtGui],
+                                         [LIBS="$LIBS $QT_LIBS"
+                                          CFLAGS="$CFLAGS $QT_CFLAGS"
+                                          CXXFLAGS="$CXXFLAGS $QT_CFLAGS"],
+                                         [missing=yes
+                                          echo "***** Missing QT ($website) *****"])
+fi
+
 ##### librt (optional) #####
 AC_SEARCH_LIBS([clock_gettime], [rt],
                           [AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
@@ -310,12 +358,9 @@ AC_SUBST([DATA_FILES])
 
 AC_CONFIG_FILES([Makefile
                                 data/Makefile
-                                doc/Makefile
-                                doc/yoink.6
-                                extra/Makefile
-                                extra/yoink.spec
-                                make-win32-installer.sh
-                 src/Makefile])
+                                src/Makefile
+                                doc/Makefile doc/yoink.6
+                                win32/Makefile win32/build-installer.sh])
 
 AC_CONFIG_HEADERS([src/config.h])