*add* make CMakeLists.txt equivalent to the autoconf behaviour

[chaz/tint2] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4efd9fc5dc98d10c9c00f67b59de08cf72dad1ac..b92bb4e7fd4563044e2001f53a11f9c3d35ae3dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.61])
-AC_INIT([tint2], [0.9-svn], [http://code.google.com/p/tint2/issues])
+AC_INIT([tint2], [0.10-svn], [http://code.google.com/p/tint2/issues])
 
 AM_INIT_AUTOMAKE
 
@@ -31,12 +31,12 @@ AM_CONDITIONAL([INSTALL_EXAMPLES], [test x$examples = xtrue])
 
 # tint2conf
 AC_ARG_ENABLE([tint2conf],
-       [AS_HELP_STRING([--enable-tint2conf], [Enable tint2conf build, a GTK+2 theme switcher for tint2])],
+       [AS_HELP_STRING([--disable-tint2conf], [Disable tint2conf build, a GTK+2 theme switcher for tint2])],
                [case "${enableval}" in
                        yes) tint2conf=true ;;
                        no)  tint2conf=false ;;
-                       *) AC_MSG_ERROR([bad value ${enableval} for --enable-tint2conf]) ;;
-               esac],[tint2conf=false])
+                       *) AC_MSG_ERROR([bad value ${enableval} for --disable-tint2conf]) ;;
+               esac],[tint2conf=true])
 AM_CONDITIONAL([ENABLE_TINT2CONF], [test x$tint2conf = xtrue])
 #
 
@@ -109,25 +109,7 @@ then
        # Sorry if that might be confusing %-)
 
        AC_CHECK_FUNCS([strndup strrchr])
-       # Save LIBS value and clear the variable, AC_CHECK_LIB will append all libs to LIBS on success.
-       LIBS_SAVED=$LIBS
-       LIBS=
-
-       AC_CHECK_LIB([pthread], [pthread_create], [],
-                                [AC_MSG_ERROR([libpthread is missing, usually provided by glibc])])
-       AC_CHECK_LIB([glib-2.0], [g_free], [],
-                                [AC_MSG_ERROR([glib-2.x is missing])])
-       AC_CHECK_LIB([gobject-2.0], [g_signal_connect_data], [],
-                                [AC_MSG_ERROR([libgobject-2.0 is missing, usually provided by glib-2.x])])
-       AC_CHECK_LIB([gtk-x11-2.0], [gtk_main], [],
-                                [AC_MSG_ERROR([gtk+-2.x is missing or not built with X support])])
-       AC_CHECK_LIB([gthread-2.0], [g_thread_init], [],
-                                [AC_MSG_ERROR([libgthread-2.0 is missing, usually provided by glib-2.x])])
-
-       TINT2CONF_LIBS="${LIBS} ${PTHREAD_LIB} ${GLIB2_LIB} ${GOBJECT2_LIB} ${IMLIB2_LIBS}"
-       LIBS=$LIBS_SAVED
-
-       TINT2CONF_CFLAGS="$(${PKG_CONFIG} --cflags gtk+-x11-2.0 glib-2.0 gobject-2.0 gthread-2.0) ${IMLIB2_CFLAGS}"
+       PKG_CHECK_MODULES([TINT2CONF], [x11 xrender imlib2 gobject-2.0 glib-2.0 gthread-2.0 gtk+-x11-2.0])
        AC_SUBST(TINT2CONF_CFLAGS)
        AC_SUBST(TINT2CONF_LIBS)