*fix* issue 260 the second

[chaz/tint2] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5365a80a2328879b361d4792bd93671a28068704..796477ea5aff88ad51fb2e317da54c83d928d3ff 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])
 #
 
@@ -66,7 +66,7 @@ PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0])
 AC_SUBST(GOBJECT2_CFLAGS)
 AC_SUBST(GOBJECT2_LIBS)
 
-PKG_CHECK_MODULES([X11], [x11 xcomposite xdamage xinerama xrender])
+PKG_CHECK_MODULES([X11], [x11 xcomposite xdamage xinerama xrender xrandr])
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
@@ -123,6 +123,10 @@ then
                                 [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])])
+       AC_CHECK_LIB([gdk-x11-2.0], [gdk_window_get_state], [],
+                                [AC_MSG_ERROR([gdk-x11-2.0 is missing, usually provided by gtk+-2.x])])
+       AC_CHECK_LIB([Xrender], [XRenderComposite], [],
+                               [AC_MSG_ERROR([XRender is missing])])
 
        TINT2CONF_LIBS="${LIBS} ${PTHREAD_LIB} ${GLIB2_LIB} ${GOBJECT2_LIB} ${IMLIB2_LIBS}"
        LIBS=$LIBS_SAVED