X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=def3e219b9a2b3eb8d4f1304276a0f0b22761834;hb=2288da0ae3b44c987687e3deeb7864fcb7b23bb9;hp=57f126a1885ebbd5515884f3be8eddae1ca35f1c;hpb=6014a41760a107d817422aa5412ccf0ce3fc6e92;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 57f126a1..def3e219 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([openbox], [3.5.0-rc1], [http://bugzilla.icculus.org]) +AC_INIT([openbox], [3.5.0], [http://bugzilla.icculus.org]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([openbox/openbox.c]) @@ -18,16 +18,16 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl RR_MAJOR_VERSION=3 RR_MINOR_VERSION=5 -RR_MICRO_VERSION=27 -RR_INTERFACE_AGE=0 -RR_BINARY_AGE=0 +RR_MICRO_VERSION=28 +RR_INTERFACE_AGE=1 +RR_BINARY_AGE=1 RR_VERSION=$RR_MAJOR_VERSION.$RR_MINOR_VERSION OBT_MAJOR_VERSION=3 OBT_MINOR_VERSION=5 -OBT_MICRO_VERSION=0 -OBT_INTERFACE_AGE=0 -OBT_BINARY_AGE=0 +OBT_MICRO_VERSION=1 +OBT_INTERFACE_AGE=1 +OBT_BINARY_AGE=1 OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION AC_SUBST(RR_MAJOR_VERSION) @@ -87,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) # AC_HEADER_TIME # AC_TYPE_SIGNAL @@ -98,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) @@ -175,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 ], [