X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=b92bb4e7fd4563044e2001f53a11f9c3d35ae3dc;hb=5ed667450b58aee80bd200dcbb7249e4203fc02f;hp=ba5e20ec702b1b3b3e2fc68c2d5ac8bb401649dc;hpb=7c6cbefdf2443e1e9fa8372585d23fff40db1768;p=chaz%2Ftint2 diff --git a/configure.ac b/configure.ac index ba5e20e..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.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 @@ -109,25 +109,7 @@ then # Sorry if that might be confusing %-) AC_CHECK_FUNCS([strndup strrchr]) - # 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} ${IMLIB2_LIBS}" - LIBS=$LIBS_SAVED - - TINT2CONF_CFLAGS="$(${PKG_CONFIG} --cflags gtk+-x11-2.0 glib-2.0 gobject-2.0 gthread-2.0) ${IMLIB2_CFLAGS}" + 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)