X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=configure.ac;h=f751b287b148b89aa9c6c466242cd3cd4febdf97;hp=7d2a0dd914ea4b663d1efb61d205a884059c2954;hb=HEAD;hpb=98bc768a710169e2e53cb42098d7e90e927d9d6b diff --git a/configure.ac b/configure.ac index 7d2a0dd9..f751b287 100644 --- a/configure.ac +++ b/configure.ac @@ -1,44 +1,72 @@ AC_PREREQ([2.54]) -AC_INIT([openbox], [3.3.995], [http://bugzilla.icculus.org]) -AM_INIT_AUTOMAKE +AC_INIT([openbox], [3.5.2], [http://bugzilla.icculus.org]) AC_CONFIG_SRCDIR([openbox/openbox.c]) +AM_INIT_AUTOMAKE([foreign]) + +OB_VERSION=$PACKAGE_VERSION +AC_SUBST(OB_VERSION) + dnl Making releases: -dnl OB_MICRO_VERSION += 1; -dnl OB_INTERFACE_AGE += 1; -dnl OB_BINARY_AGE += 1; -dnl if any functions have been added, set OB_INTERFACE_AGE to 0. +dnl RR_MICRO_VERSION += 1; +dnl RR_INTERFACE_AGE += 1; +dnl R_BINARY_AGE += 1; +dnl if any functions have been added, set RR_INTERFACE_AGE to 0. dnl if backwards compatibility has been broken, -dnl set OB_BINARY_AGE and OB_INTERFACE_AGE to 0. +dnl set RR_BINARY_AGE and RR_INTERFACE_AGE to 0. dnl dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl -OB_MAJOR_VERSION=3 -OB_MINOR_VERSION=4 -OB_MICRO_VERSION=11 -OB_INTERFACE_AGE=0 -OB_BINARY_AGE=5 -OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION - -AC_SUBST(OB_MAJOR_VERSION) -AC_SUBST(OB_MINOR_VERSION) -AC_SUBST(OB_MICRO_VERSION) -AC_SUBST(OB_INTERFACE_AGE) -AC_SUBST(OB_BINARY_AGE) -AC_SUBST(OB_VERSION) +RR_MAJOR_VERSION=3 +RR_MINOR_VERSION=5 +RR_MICRO_VERSION=30 +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=3 +OBT_INTERFACE_AGE=1 +OBT_BINARY_AGE=1 +OBT_VERSION=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION + +AC_SUBST(RR_MAJOR_VERSION) +AC_SUBST(RR_MINOR_VERSION) +AC_SUBST(RR_MICRO_VERSION) +AC_SUBST(RR_INTERFACE_AGE) +AC_SUBST(RR_BINARY_AGE) +AC_SUBST(RR_VERSION) +AC_SUBST(OBT_MAJOR_VERSION) +AC_SUBST(OBT_MINOR_VERSION) +AC_SUBST(OBT_MICRO_VERSION) +AC_SUBST(OBT_INTERFACE_AGE) +AC_SUBST(OBT_BINARY_AGE) +AC_SUBST(OBT_VERSION) dnl Libtool versioning -LT_RELEASE=$OB_MAJOR_VERSION.$OB_MINOR_VERSION -LT_CURRENT=`expr $OB_MICRO_VERSION - $OB_INTERFACE_AGE` -LT_REVISION=$OB_INTERFACE_AGE -LT_AGE=`expr $OB_BINARY_AGE - $OB_INTERFACE_AGE` -LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` - -AC_SUBST(LT_RELEASE) -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) -AC_SUBST(LT_CURRENT_MINUS_AGE) +RR_RELEASE=$RR_MAJOR_VERSION.$RR_MINOR_VERSION +RR_CURRENT=`expr $RR_MICRO_VERSION - $RR_INTERFACE_AGE` +RR_REVISION=$RR_INTERFACE_AGE +RR_AGE=`expr $RR_BINARY_AGE - $RR_INTERFACE_AGE` +RR_CURRENT_MINUS_AGE=`expr $RR_CURRENT - $RR_AGE` + +OBT_RELEASE=$OBT_MAJOR_VERSION.$OBT_MINOR_VERSION +OBT_CURRENT=`expr $OBT_MICRO_VERSION - $OBT_INTERFACE_AGE` +OBT_REVISION=$OBT_INTERFACE_AGE +OBT_AGE=`expr $OBT_BINARY_AGE - $OBT_INTERFACE_AGE` +OBT_CURRENT_MINUS_AGE=`expr $OBT_CURRENT - $OBT_AGE` + +AC_SUBST(RR_RELEASE) +AC_SUBST(RR_CURRENT) +AC_SUBST(RR_REVISION) +AC_SUBST(RR_AGE) +AC_SUBST(RR_CURRENT_MINUS_AGE) +AC_SUBST(OBT_RELEASE) +AC_SUBST(OBT_CURRENT) +AC_SUBST(OBT_REVISION) +AC_SUBST(OBT_AGE) +AC_SUBST(OBT_CURRENT_MINUS_AGE) AC_PREFIX_DEFAULT([/usr/local]) test "$prefix" = "NONE" && prefix=$ac_default_prefix @@ -60,17 +88,21 @@ 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/time.h sys/wait.h) -# AC_HEADER_TIME -# AC_TYPE_SIGNAL +AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h) +AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h) +AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h) AC_PATH_PROG([SED], [sed], [no]) if test "$SED" = "no"; then AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.]) fi -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.6.0]) +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) @@ -78,25 +110,21 @@ PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0 pangoxft >= 1.8.0]) AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) -PKG_CHECK_MODULES(XFT, [xft]) -AC_SUBST(XFT_CFLAGS) -AC_SUBST(XFT_LIBS) - -PKG_CHECK_MODULES(XML, [libxml-2.0]) +PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0]) AC_SUBST(XML_CFLAGS) AC_SUBST(XML_LIBS) AC_ARG_ENABLE(startup-notification, AC_HELP_STRING( [--disable-startup-notification], - [disable the startup notification library. [[default=enabled]]] + [disable the startup notification library. [default=enabled]] ), [enable_sn=$enableval], [enable_sn=yes] ) if test "$enable_sn" = yes; then -PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0], +PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0 >= 0.8], [ AC_DEFINE(USE_LIBSN, [1], [Use startup-notification]) AC_SUBST(LIBSN_CFLAGS) @@ -114,7 +142,7 @@ fi AC_ARG_ENABLE(xcursor, AC_HELP_STRING( [--disable-xcursor], - [disable use of the X Cursor library. [[default=enabled]]] + [disable use of the X Cursor library. [default=enabled]] ), [enable_xcursor=$enableval], [enable_xcursor=yes] @@ -136,6 +164,66 @@ else xcursor_found=no fi +AC_ARG_ENABLE(imlib2, + AC_HELP_STRING( + [--disable-imlib2], + [disable use of Imlib2 image library for loading icons. [default=enabled]] + ), + [enable_imlib2=$enableval], + [enable_imlib2=yes] +) + +if test "$enable_imlib2" = yes; then +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 + ], + [ + imlib2_found=no + ] +) +else + imlib2_found=no +fi + +AM_CONDITIONAL(USE_IMLIB2, [test $imlib2_found = yes]) + +AC_ARG_ENABLE(librsvg, + AC_HELP_STRING( + [--disable-librsvg], + [disable use of SVG image files for loading icons. [default=enabled]] + ), + [enable_librsvg=$enableval], + [enable_librsvg=yes] +) + +if test "$enable_librsvg" = yes; then +PKG_CHECK_MODULES(LIBRSVG, [librsvg-2.0], + [ + AC_DEFINE(USE_LIBRSVG, [1], [Use SVG image files]) + AC_SUBST(LIBRSVG_CFLAGS) + AC_SUBST(LIBRSVG_LIBS) + # export it for the pkg-config file + PKG_CONFIG_LIBRSVG=librsvg-2.0 + AC_SUBST(PKG_CONFIG_LIBRSVG) + librsvg_found=yes + ], + [ + librsvg_found=no + ] +) +else + librsvg_found=no +fi + +AM_CONDITIONAL(USE_LIBRSVG, [test $librsvg_found = yes]) + dnl Check for session management X11_SM @@ -149,13 +237,16 @@ X11_EXT_XRANDR X11_EXT_SHAPE X11_EXT_XINERAMA X11_EXT_SYNC +X11_EXT_AUTH AC_CONFIG_FILES([ Makefile m4/Makefile po/Makefile.in - render/obrender-3.0.pc - parser/obparser-3.0.pc + obrender/obrender-3.5.pc + obt/obt-3.5.pc + obrender/version.h + obt/version.h version.h ]) AC_CONFIG_COMMANDS([doc], @@ -171,5 +262,7 @@ AC_MSG_RESULT([Compiling with these options: Startup Notification... $sn_found X Cursor Library... $xcursor_found Session Management... $SM + Imlib2 Library... $imlib2_found + SVG Support (librsvg)... $librsvg_found ]) AC_MSG_RESULT([configure complete, now type "make"])