Fix some rebase artifacts

[mikachu/openbox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 99b416a..78b5aa6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,9 @@ AC_INIT([openbox], [3.5.0-rc1], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
+OB_VERSION=$PACKAGE_VERSION
+AC_SUBST(OB_VERSION)
+
 dnl Making releases:
 dnl   RR_MICRO_VERSION += 1;
 dnl   RR_INTERFACE_AGE += 1;
@@ -84,9 +87,9 @@ AC_PROG_INSTALL
 AM_GNU_GETTEXT_VERSION(0.15)
 AM_GNU_GETTEXT([external])
 
-AC_CHECK_HEADERS(ctype.h fcntl.h locale.h signal.h string.h stdio.h stdlib.h)
-AC_CHECK_HEADERS(unistd.h sys/stat.h sys/select.h sys/socket.h sys/time.h)
-AC_CHECK_HEADERS(sys/wait.h)
+AC_CHECK_HEADERS(ctype.h fcntl.h grp.h locale.h pwd.h signal.h string.h)
+AC_CHECK_HEADERS(stdio.h stdlib.h unistd.h sys/stat.h sys/select.h)
+AC_CHECK_HEADERS(sys/socket.h sys/time.h sys/wait.h sys/inotify.h)
 # AC_HEADER_TIME
 # AC_TYPE_SIGNAL
 
@@ -95,6 +98,11 @@ if test "$SED" = "no"; then
   AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.])
 fi
 
+AC_PATH_PROG([DIRNAME], [dirname], [no])
+if test "$DIRNAME" = "no"; then
+  AC_MSG_ERROR([The program "dirname" is not available. This program is required to build Openbox.])
+fi
+
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
@@ -172,6 +180,9 @@ PKG_CHECK_MODULES(IMLIB2, [imlib2],
     AC_DEFINE(USE_IMLIB2, [1], [Use Imlib2 image library])
     AC_SUBST(IMLIB2_CFLAGS)
     AC_SUBST(IMLIB2_LIBS)
+    # export it for the pkg-config file
+    PKG_CONFIG_IMLIB=imlib2
+    AC_SUBST(PKG_CONFIG_IMLIB)
     imlib2_found=yes
   ],
   [
@@ -206,6 +217,7 @@ AC_CONFIG_FILES([
   obt/obt-3.5.pc
   obrender/version.h
   obt/version.h
+  version.h
 ])
 AC_CONFIG_COMMANDS([doc],
                    [test -d doc || mkdir doc])