*fix* stupid mistake corrected

[chaz/tint2] / configure.ac

diff --git a/configure.ac b/configure.ac
index c6276c8fab66bd06fe0e78d855e349c425b553de..c2d4929398d8ef1126d8feea9d8e050e97111583 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.7.9-svn], [http://code.google.com/p/tint2/issues])
+AC_INIT([tint2], [0.8], [http://code.google.com/p/tint2/issues])
 
 AM_INIT_AUTOMAKE
 
@@ -31,7 +31,7 @@ AM_CONDITIONAL([INSTALL_EXAMPLES], [test x$examples = xtrue])
 
 # tint2conf
 AC_ARG_ENABLE([tint2conf],
-       [AS_HELP_STRING([--enable-tint2conf], [Build and install tint2conf, a GTK+2 configuration utility for tint2 (EXPERIMENTAL)])],
+       [AS_HELP_STRING([--enable-tint2conf], [Enable tint2conf build, a GTK+2 theme switcher for tint2])],
                [case "${enableval}" in
                        yes) tint2conf=true ;;
                        no)  tint2conf=false ;;
@@ -66,7 +66,7 @@ PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0])
 AC_SUBST(GOBJECT2_CFLAGS)
 AC_SUBST(GOBJECT2_LIBS)
 
-PKG_CHECK_MODULES([X11], [x11])
+PKG_CHECK_MODULES([X11], [x11 xdamage xcomposite])
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
@@ -109,6 +109,7 @@ then
        # even if we don't need them.
        # Sorry if that might be confusing %-)
 
+       AC_CHECK_FUNCS([strndup strrchr strstr])
        # Save LIBS value and clear the variable, AC_CHECK_LIB will append all libs to LIBS on success.
        LIBS_SAVED=$LIBS
        LIBS=
@@ -124,12 +125,21 @@ then
        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}"
+       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)"
+       TINT2CONF_CFLAGS="$(${PKG_CONFIG} --cflags gtk+-x11-2.0 glib-2.0 gobject-2.0 gthread-2.0) ${IMLIB2_CFLAGS}"
        AC_SUBST(TINT2CONF_CFLAGS)
        AC_SUBST(TINT2CONF_LIBS)
+
+       # Python stuff
+       AC_PATH_PROG([__PYTHON], [python])
+       if test -z "${__PYTHON}";
+       then
+               AC_MSG_ERROR([tint2conf requires python to be installed])
+       fi
+
+       PKG_CHECK_EXISTS([pygtk-2.0],,[AC_MSG_ERROR([tint2conf requires >=pygtk-2.0])])
 fi
 #