X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=c2d4929398d8ef1126d8feea9d8e050e97111583;hb=5a10bb1b43935ba67ffff036bf2b56eceacb802f;hp=4a2f5d31fff49732e987a647a1c3be5d76ade323;hpb=1ac35c69ce875cbee3740cffee1cb9d41dcc34ef;p=chaz%2Ftint2

diff --git a/configure.ac b/configure.ac
index 4a2f5d3..c2d4929 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([tint2], [0.7.9-svn], [http://code.google.com/p/tint2/issues])
+AC_PREREQ([2.61])
+AC_INIT([tint2], [0.8], [http://code.google.com/p/tint2/issues])
 
 AM_INIT_AUTOMAKE
 
@@ -30,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 ;;
@@ -65,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)
 
@@ -97,7 +98,8 @@ AC_TYPE_PID_T
 # Checks for library functions.
 AC_FUNC_FORK
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([gettimeofday memset select setlocale strcasecmp strchr strdup])
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([alarm gettimeofday memset select setlocale strcasecmp strchr strdup])
 
 # tint2conf (experimental)
 if test "x$tint2conf" = xtrue;
@@ -107,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=
@@ -122,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
 #
 
@@ -142,6 +154,7 @@ AC_SUBST(DISTCLEANFILES)
 
 AC_CONFIG_FILES([Makefile
 				 doc/Makefile
+				 sample/Makefile
 				 src/Makefile
 				 src/tint2conf/Makefile])