fixed icon on 64 bit system by benjaminfranzke

[chaz/tint2] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8e3bc019229987bffe99f009c98c58b160b8443e..81dd04c3414e5d851179a009cd1dd6336911af1f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([tint2], [0.7_beta2], [http://code.google.com/p/tint2/issues])
+AC_INIT([tint2], [0.7.1], [http://code.google.com/p/tint2/issues])
 
 LT_INIT
 AM_INIT_AUTOMAKE
@@ -10,6 +10,7 @@ AC_CONFIG_SRCDIR([src/tint.c])
 AC_CONFIG_HEADERS([config.h])
 
 # Checks for programs.
+AC_LANG([C])
 AC_PROG_CC
 
 # Checks for libraries.
@@ -45,10 +46,11 @@ PKG_CHECK_MODULES([IMLIB2], [imlib2])
 AC_SUBST(IMLIB2_CFLAGS)
 AC_SUBST(IMLIB2_LIBS)
 
-## We need just the header so AC_CHECK_HEADERS might be enough...
-#PKG_CHECK_MODULES([XRANDR], [xrandr])
-#AC_SUBST(XRANDR_CFLAGS)
-#AC_SUBST(XRANDR_LIBS)
+# Ensure that Imlib2 has been built with X support and reset LIBS since AC_CHECK_LIB adds -lImlib2 on success.
+LIBS_SAVED=$LIBS
+AC_CHECK_LIB([Imlib2], [imlib_context_set_display], [],
+                        AC_MSG_ERROR([Imlib2 must be built with X support]))
+LIBS=$LIBS_SAVED
 
 # Checks for header files.
 AC_PATH_X
@@ -65,8 +67,17 @@ AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday memset select setlocale strcasecmp strchr strdup])
 
+AC_ARG_ENABLE([battery],
+                         [AS_HELP_STRING([--disable-battery], [Disable battery status plugin])],
+                         [case "${enableval}" in
+                          yes) battery=true ;;
+                          no) battery=false ;;
+                          *) AC_MSG_ERROR([bad value ${enableval} for --disable-battery]) ;;
+                  esac], [battery=true])
+AM_CONDITIONAL([ENABLE_BATTERY], [test x$battery = xtrue])
+
 AC_ARG_ENABLE([examples],
-                         [AS_HELP_STRING([--enable-examples], [Install additional $(PACKAGE_NAME)rc examples])],
+                         [AS_HELP_STRING([--enable-examples], [Install additional tin2rc examples])],
                          [case "${enableval}" in
                           yes) examples=true ;;
                           no)  examples=false ;;
@@ -74,15 +85,6 @@ AC_ARG_ENABLE([examples],
                   esac],[examples=false])
 AM_CONDITIONAL([INSTALL_EXAMPLES], [test x$examples = xtrue])
 
-AC_ARG_ENABLE([doc],
-                         [AS_HELP_STRING([--enable-doc], [Install additional documentation])],
-              [case "${enableval}" in
-                          yes) doc=true ;;
-                          no)  doc=false ;;
-                          *) AC_MSG_ERROR([bad value ${enableval} for --enable-doc]) ;;
-                  esac],[doc=false])
-AM_CONDITIONAL([INSTALL_DOC], [test x$doc = xtrue])
-
 AC_CONFIG_FILES([
                                 Makefile
                                 doc/Makefile