X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=configure.ac;h=e7f41c47cbf6fc3bbbc0eb7ccbc988e9bac8f839;hb=14bb7c359cd5d07fb27cd36f6dae19991bb6836f;hp=90fb749b139836bcaaf86c6bf05d8d8181f80718;hpb=bb446dc3538a375b96e86fc43e95e70ee183a3bf;p=chaz%2Ftint2

diff --git a/configure.ac b/configure.ac
index 90fb749..e7f41c4 100644
--- 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.9rc1], [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([--disable-tint2conf], [Disable tint2conf build, a GTK+2 theme switcher for tint2])],
+	[AS_HELP_STRING([--enable-tint2conf], [Enable 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 --disable-tint2conf]) ;;
-		esac],[tint2conf=true])
+			*) AC_MSG_ERROR([bad value ${enableval} for --enable-tint2conf]) ;;
+		esac],[tint2conf=false])
 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])
+PKG_CHECK_MODULES([X11], [x11 xdamage xcomposite])
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
@@ -125,10 +125,10 @@ 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)
 
@@ -156,6 +156,7 @@ AC_CONFIG_FILES([Makefile
 				 doc/Makefile
 				 sample/Makefile
 				 src/Makefile
-				 src/tint2conf/Makefile])
+				 src/tint2conf/Makefile
+				 src/version.h])
 
 AC_OUTPUT