X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=b92bb4e7fd4563044e2001f53a11f9c3d35ae3dc;hb=a5e29ad3532c63d5f3a4927f59f8c6c8a3b18731;hp=c6276c8fab66bd06fe0e78d855e349c425b553de;hpb=108ab1deff6cef7d1d9fd27c0125e2456848526b;p=chaz%2Ftint2

diff --git a/configure.ac b/configure.ac
index c6276c8..b92bb4e 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.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], [Build and install tint2conf, a GTK+2 configuration utility for tint2 (EXPERIMENTAL)])],
+	[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,27 +66,26 @@ 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 xcomposite xdamage xinerama xrender xrandr])
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
-PKG_CHECK_MODULES([XINERAMA], [xinerama])
-AC_SUBST(XINERAMA_CFLAGS)
-AC_SUBST(XINERAMA_LIBS)
-
 PKG_CHECK_MODULES([IMLIB2], [imlib2])
 AC_SUBST(IMLIB2_CFLAGS)
 AC_SUBST(IMLIB2_LIBS)
 
-# Ensure that Imlib2 has been built with X support and reset LIBS since AC_CHECK_LIB adds -lImlib2 on success.
+# Reset LIBS since AC_CHECK_LIB adds -lmylib on success
 LIBS_SAVED=$LIBS
+# Ensure that Imlib2 has been built with X support.
 AC_CHECK_LIB([Imlib2], [imlib_context_set_display], [],
 			 AC_MSG_ERROR([Imlib2 must be built with X support]))
+
+AC_CHECK_LIB([rt], [clock_gettime])
 LIBS=$LIBS_SAVED
 
 # Checks for header files.
 AC_PATH_X
-AC_CHECK_HEADERS([fcntl.h locale.h stdlib.h string.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([fcntl.h locale.h stdint.h stdlib.h string.h sys/time.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
@@ -99,7 +98,7 @@ AC_TYPE_PID_T
 AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([alarm gettimeofday memset select setlocale strcasecmp strchr strdup])
+AC_CHECK_FUNCS([clock_gettime gettimeofday memset select setenv setlocale strcasecmp strchr strdup strstr])
 
 # tint2conf (experimental)
 if test "x$tint2conf" = xtrue;
@@ -109,27 +108,19 @@ then
 	# even if we don't need them.
 	# Sorry if that might be confusing %-)
 
-	# 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}"
-	LIBS=$LIBS_SAVED
-
-	TINT2CONF_CFLAGS="$(${PKG_CONFIG} --cflags gtk+-x11-2.0 glib-2.0 gobject-2.0 gthread-2.0)"
+	AC_CHECK_FUNCS([strndup strrchr])
+	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)
+
+	# 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
 #
 
@@ -146,6 +137,7 @@ AC_CONFIG_FILES([Makefile
 				 doc/Makefile
 				 sample/Makefile
 				 src/Makefile
-				 src/tint2conf/Makefile])
+				 src/tint2conf/Makefile
+				 src/version.h])
 
 AC_OUTPUT