X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=2d84162ffe502f587e7339048b24a78edcbcab4a;hb=df50b6bbd4e3a16885669743e6aa5c671b7a0730;hp=12554079acfad11642e3366e3f8ebc5138dccc1a;hpb=5f78b51429b204f89b654d634bb4cc8cb78b95f6;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 12554079..a55d4f4e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,311 +1,175 @@ -AC_INIT([src/main.cc]) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([openbox], [2.90.0cvs]) +AC_PREREQ([2.54]) +AC_INIT([openbox], [3.3.995], [http://bugzilla.icculus.org]) +AM_INIT_AUTOMAKE +AC_CONFIG_SRCDIR([openbox/openbox.c]) + +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 if backwards compatibility has been broken, +dnl set OB_BINARY_AGE and OB_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=5 +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) + +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) + +AC_PREFIX_DEFAULT([/usr/local]) +test "$prefix" = "NONE" && prefix=$ac_default_prefix + +dnl Determine build target +OB_DEBUG +dnl Pick compiler specific/build target flags, and set $CVS +AM_PROG_CC_C_O +OB_COMPILER_FLAGS +AC_C_CONST +AC_C_INLINE -AC_PREREQ([2.50]) - -AC_PATH_PROG([regex_cmd], [sed]) -test "$regex_cmd" || AC_MSG_ERROR([sed not found]) - -AC_PROG_CC -AC_PROG_CXX AC_PROG_LIBTOOL +AC_SUBST(LIBTOOL_DEPS) LIBTOOL="$LIBTOOL --silent" -AC_PROG_INSTALL -ALL_LINGUAS="" -AM_GNU_GETTEXT - -dnl AC_LANG(C++) - -dnl Check what compiler we are using -AC_MSG_CHECKING([for GCC]) -if test "$GCC" = "yes"; then - AC_MSG_RESULT([yes]) - CFLAGS="$CFLAGS -Wall -W -pedantic" -else - AC_MSG_RESULT([no, trying other compilers]) - AC_MSG_CHECKING(for MIPSpro) - mips_pro_ver=`$CXX -version 2>&1 | grep -i mipspro | cut -f4 -d ' '` - if test -z "$mips_pro_ver"; then - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes, version $mips_pro_ver.]) - AC_MSG_CHECKING(for -LANG:std in CFLAGS) - lang_std_not_set=`echo $CFLAGS | grep "\-LANG:std"` - if test "x$lang_std_not_set" = "x"; then - AC_MSG_RESULT([not set, setting.]) - CFLAGS="${CFLAGS} -LANG:std" - else - AC_MSG_RESULT([already set.]) - fi - fi -fi +AC_PROG_INSTALL -dnl Determine if maintainer portions of the Makefiles should be included. -AM_MAINTAINER_MODE +AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT([external]) -dnl Check for system header files -AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h stdlib.h string.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h) -AC_HEADER_TIME +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 -dnl Determine the return type of signal handlers -AC_TYPE_SIGNAL +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 -dnl Check whether to include debugging code -DEBUG="" -AC_MSG_CHECKING([whether to include verbose debugging code]) -AC_ARG_ENABLE([debug], - [ --enable-debug include verbose debugging code @<:@default=no@:>@], - if test "$enableval" = "yes"; then - AC_MSG_RESULT([yes]) - if test "$GCC" = "yes"; then - DEBUG="-DDEBUG -fno-inline -g" - else - DEBUG="-DDEBUG" - fi - else - AC_MSG_RESULT([no]) - DEBUG="-DNDEBUG" - fi, - AC_MSG_RESULT([no]) - DEBUG="-DNDEBUG" +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.6.0]) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + +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]) +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]]] + ), + [enable_sn=$enableval], + [enable_sn=yes] ) -CFLAGS="$CFLAGS $DEBUG" - -dnl Check for Python -AC_CHECK_HEADER([python2.2/Python.h], - , - AC_MSG_ERROR([Openbox requires the use of Python 2.2. This is its secret special formula for extreme sexiness. -See http://www.python.org -])) -AC_CHECK_LIB([python2.2], [Py_Initialize], - PYTHON_LDFLAGS="-lpython2.2", -dnl -Xlinker -export-dynamic", - AC_MSG_ERROR([Openbox requires the use of Python 2.2. This is its secret special formula for extreme sexiness. -See http://www.python.org -])) -PYTHON_CFLAGS="-I/usr/include/python2.2 -I/usr/gwar/include/python2.2" -AC_SUBST([PYTHON_CFLAGS]) -AC_SUBST([PYTHON_LDFLAGS]) -dnl Check for guile -GUILE_FLAGS - -dnl Check for X headers and libraries -AC_PATH_X -AC_PATH_XTRA -test "$no_x" = "yes" && AC_MSG_ERROR([No Xlibs found.]) -test -z "$x_includes" && x_includes="/usr/include" -test -z "$x_libraries" && x_libraries="/usr/lib" - -CFLAGS="$CFLAGS $X_CFLAGS" -LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS" -LDFLAGS="$LDFLAGS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" - -dnl Check for required functions in -lX11 -AC_CHECK_LIB([X11], [XOpenDisplay], - , - AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]) +if test "$enable_sn" = yes; then +PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0], + [ + AC_DEFINE(USE_LIBSN, [1], [Use startup-notification]) + AC_SUBST(LIBSN_CFLAGS) + AC_SUBST(LIBSN_LIBS) + sn_found=yes + ], + [ + sn_found=no + ] ) - - -dnl Check for Xft >= 2 -XFT_MIN_MAJOR=2 -XFT_MIN_MINOR=0 -XFT_MIN_REVISION=0 -XFT_MIN=$XFT_MIN_MAJOR.$XFT_MIN_MINOR.$XFT_MIN_REVISION -AC_MSG_CHECKING([for Xft version >= $XFT_MIN]) -if ! pkg-config --atleast-version $XFT_MIN xft; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Openbox requires the Xft version >= $XFT_MIN font library. -See http://www.fontconfig.org/ -]) +else + sn_found=no fi -AC_MSG_RESULT([yes]) - -dnl Store these -OLDLIBS=$LIBS -OLDCFLAGS=$CFLAGS - -XFT_CFLAGS="`pkg-config --cflags xft`" -XFT_LIBS="`pkg-config --libs xft`" - -dnl Set these for checking with the tests below. They'll be restored after -LIBS="$LIBS $XFT_LIBS" -CFLAGS="$XFT_CFLAGS $CFLAGS" - -AC_CHECK_LIB([Xft], [XftFontOpenName], - AC_MSG_CHECKING([for X11/Xft/Xft.h for Xft >= $XFT_MIN]) - AC_TRY_COMPILE( - [ - #include - #include - ], - [ - #if !defined(XFT_MAJOR) - # error Xft.h is too old - #endif - #if XFT_MAJOR < $XFT_MIN_MAJOR - # error Xft.h is too old - #endif - #if XFT_MAJOR == $XFT_MIN_MAJOR - # if XFT_MINOR < $XFT_MIN_MINOR - # error Xft.h is too old - # endif - #endif - #if XFT_MAJOR == $XFT_MIN_MAJOR - # if XFT_MAJOR == $XFT_MIN_MINOR - # if XFT_REVISION < $XFT_MIN_REVISION - # error Xft.h is too old - # endif - # endif - #endif - - int i = XFT_MAJOR; - XftFont foo; - ], - [ - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Openbox requires the Xft version >= $XFT_MIN font library. -See http://www.fontconfig.org/ -]) - ] - ) - - AC_MSG_CHECKING([if we can compile with Xft]) - AC_TRY_LINK( - [ - #include - #include - ], - [ - int i = XFT_MAJOR; - XftFont foo - ], - [ - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Unable to compile with the Xft library. -]) - ] - ) +AC_ARG_ENABLE(xcursor, + AC_HELP_STRING( + [--disable-xcursor], + [disable use of the X Cursor library. [[default=enabled]]] + ), + [enable_xcursor=$enableval], + [enable_xcursor=yes] ) -dnl Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's -LIBS=$OLDLIBS -CFLAGS=$OLDCFLAGS -AC_SUBST([XFT_CFLAGS]) -AC_SUBST([XFT_LIBS]) - -dnl Check for XShape extension support -AC_CHECK_LIB([Xext], [XShapeCombineShape], - AC_MSG_CHECKING([for X11/extensions/shape.h]) - AC_TRY_LINK( - [ - #include - #include - #include - ], - [ - long foo = ShapeSet - ], - [ - AC_MSG_RESULT([yes]) - SHAPE="yes" - AC_DEFINE([SHAPE], [1], [Found the XShape extension]) - LIBS="$LIBS -lXext" - ], - [ - AC_MSG_RESULT([no]) - SHAPE="no" - ] - ) +if test "$enable_xcursor" = yes; then +PKG_CHECK_MODULES(XCURSOR, [xcursor], + [ + AC_DEFINE(USE_XCURSOR, [1], [Use X Cursor library]) + AC_SUBST(XCURSOR_CFLAGS) + AC_SUBST(XCURSOR_LIBS) + xcursor_found=yes + ], + [ + xcursor_found=no + ] ) -AC_MSG_CHECKING([for the XShape extension]) -if test "$SHAPE" = "yes"; then - AC_MSG_RESULT([yes]) else - AC_MSG_RESULT([no]) + xcursor_found=no fi -dnl Check for Xinerama extension support -AC_MSG_CHECKING([whether to build support for the Xinerama extension]) -XINERAMA="no" -AC_ARG_ENABLE([xinerama], -[ --enable-xinerama enable support of the Xinerama extension @<:@default=no@:>@], - if test "$enableval" = "yes"; then - AC_MSG_RESULT([yes]) - - AC_CHECK_LIB([Xinerama], [XineramaQueryExtension], - [ - AC_MSG_CHECKING([for X11/extensions/Xinerama.h]) - AC_TRY_LINK( - [ - #include - #include - ], - [ - XineramaScreenInfo foo - ], - [ - AC_MSG_RESULT([yes]) - XINERAMA="yes" - AC_DEFINE([XINERAMA], [1], - [Enable support of the Xinerama extension]) - LIBS="$LIBS -lXinerama" - ], - [ - AC_MSG_RESULT([no]) - ] - ) - ] - ) - - AC_MSG_CHECKING([for the Xinerama extension]) - if test "$XINRERAMA" = "yes"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([no]) -) - - - -AC_CONFIG_FILES([Makefile - m4/Makefile - po/Makefile.in - intl/Makefile - otk/Makefile - src/Makefile - util/Makefile - util/epist/Makefile - doc/Makefile - doc/doxygen/Makefile - data/Makefile - data/styles/Makefile - version.h - ]) +dnl Check for session management +X11_SM + +#EFENCE_LIBS=-lefence +EFENCE_LIBS="" +AC_SUBST(EFENCE_LIBS) + +dnl Check for X11 extensions +X11_EXT_XKB +X11_EXT_XRANDR +X11_EXT_SHAPE +X11_EXT_XINERAMA +X11_EXT_SYNC + +AC_CONFIG_FILES([ + Makefile + m4/Makefile + po/Makefile.in + render/obrender-3.0.pc + parser/obparser-3.0.pc + version.h +]) +AC_CONFIG_COMMANDS([doc], + [test -d doc || mkdir doc]) +AC_CONFIG_COMMANDS([data], + [test -d data || mkdir data]) +AC_CONFIG_COMMANDS([data/xsession], + [test -d data/xsession || mkdir data/xsession]) AC_OUTPUT AC_MSG_RESULT -AC_MSG_RESULT([$PACKAGE version $VERSION configured successfully.]) - -AC_MSG_RESULT -AC_MSG_RESULT([Using '$prefix' for installation.]) -AC_MSG_RESULT([Using '$CXX' for C++ compiler.]) -AC_MSG_RESULT([Building with '$CFLAGS' for C++ compiler flags.]) -AC_MSG_RESULT([Building with '$LIBS' for linker flags.]) -AC_MSG_RESULT -AC_MSG_RESULT([configure complete, now type \"make\"]) -AC_MSG_RESULT +AC_MSG_RESULT([Compiling with these options: + Startup Notification... $sn_found + X Cursor Library... $xcursor_found + Session Management... $SM + ]) +AC_MSG_RESULT([configure complete, now type "make"])