X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=configure.ac;h=f68796e8440a4030bdb09f8daf63d44b134720cc;hb=3814c4fbebb1f3e5e489225a0280d6a1958d1543;hp=08b6c1c2be6eb1cdc41759d89807cf1f66cc0873;hpb=700984bd150d98a6876c117c2e1b1b3c72cffce1;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 08b6c1c2..f68796e8 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,8 @@ AM_INIT_AUTOMAKE([openbox], [2.90.0cvs]) AC_PREREQ([2.50]) +test "$prefix" = "NONE" && prefix="$ac_default_prefix" + AC_PATH_PROG([regex_cmd], [sed]) test "$regex_cmd" || AC_MSG_ERROR([sed not found]) @@ -14,15 +16,17 @@ LIBTOOL="$LIBTOOL --silent" AC_PROG_INSTALL ALL_LINGUAS="" -AM_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION(0.11.5) +AM_GNU_GETTEXT([external]) -dnl AC_LANG(C++) +AC_LANG(C++) -dnl Check what compiler we are using +# 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" + CXXFLAGS="$CXXFLAGS -Wall -W" +# -pedantic" else AC_MSG_RESULT([no, trying other compilers]) AC_MSG_CHECKING(for MIPSpro) @@ -31,28 +35,28 @@ else 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"` + AC_MSG_CHECKING(for -LANG:std in CXXFLAGS) + lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"` if test "x$lang_std_not_set" = "x"; then AC_MSG_RESULT([not set, setting.]) - CFLAGS="${CFLAGS} -LANG:std" + CXXFLAGS="${CXXFLAGS} -LANG:std" else AC_MSG_RESULT([already set.]) fi fi fi -dnl Determine if maintainer portions of the Makefiles should be included. +# Determine if maintainer portions of the Makefiles should be included. AM_MAINTAINER_MODE -dnl Check for system header files +# 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 -dnl Determine the return type of signal handlers -AC_TYPE_SIGNAL +# Determine the return type of signal handlers +# AC_TYPE_SIGNAL -dnl Check whether to include debugging code +# Check whether to include debugging code DEBUG="" AC_MSG_CHECKING([whether to include verbose debugging code]) AC_ARG_ENABLE([debug], @@ -71,40 +75,108 @@ AC_ARG_ENABLE([debug], AC_MSG_RESULT([no]) DEBUG="-DNDEBUG" ) -CFLAGS="$CFLAGS $DEBUG" +CXXFLAGS="$CXXFLAGS $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 -Xlinker -export-dynamic", - AC_MSG_ERROR([Openbox requires the use of Python 2.2. This is its secret special formula for extreme sexiness. +# Check for Python +AC_ARG_WITH([python], + [ --with-python=path Set location of Python executable], + [PYTHON="$withval"], + [PYTHON=]) + +# Find the python bin +if ! test "$PYTHON"; then + AC_CHECK_PROGS(PYTHON, $prefix/bin/python python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4) +fi +if ! test "$PYTHON"; then + AC_MSG_ERROR([Openbox requires the use of Python. This is its secret special formula for extreme sexiness. See http://www.python.org -])) -AC_SUBST([PYTHON_LDFLAGS]) +]) +fi + +# Find our python paths +AC_MSG_CHECKING([for Python version]) +# Need to do this hack since autoconf replaces __file__ with the name of the configure file +filehack="file__" +PYVERSION=`($PYTHON -c "import string,operator; print operator.getitem(string.split(string.__$filehack,'/'),-2)")` +AC_MSG_RESULT([$PYVERSION]) + +AC_MSG_CHECKING([for Python prefix]) +PYPREFIX=`($PYTHON -c "import sys; print sys.prefix") 2>/dev/null` +AC_MSG_RESULT([$PYPREFIX]) +AC_MSG_CHECKING([for Python exec-prefix]) +PYEPREFIX=`($PYTHON -c "import sys; print sys.exec_prefix") 2>/dev/null` +AC_MSG_RESULT([$PYEPREFIX]) + +# Find the include directory +AC_MSG_CHECKING([for Python header files]) +if test -r "$PYPREFIX/include/$PYVERSION/Python.h"; then + PYTHON_CFLAGS="-I$PYPREFIX/include/$PYVERSION" +fi +if test -z "$PYTHON_CFLAGS"; then + if test -r "$PYPREFIX/include/Py/Python.h"; then + PYTHON_CFLAGS="-I$PYPREFIX/include/Py" + fi +fi +if ! test "$PYTHON_CFLAGS"; then + AC_MSG_ERROR([Not found]) +else + AC_MSG_RESULT([$PYTHON_CFLAGS]) +fi + +# Find the python library +PYTHON_LIBS="" +AC_MSG_CHECKING([for Python library]) +dirs="$PYEPREFIX/lib $PYEPREFIX/lib/$PYVERSION/config \ + $PYEPREFIX/lib/$PYVERSION/lib $PYEPREFIX/lib/python/lib" +for i in $dirs; do + # look for really old versions + if test -r "$i/lib$PYVERSION.so"; then + PYLIB="$i" + PYTHON_LIBS="-L$PYLIB -l$PYVERSION" + break + else + if test -r "$i/libPython.a"; then + PYLIB="$i" + PYTHON_LIBS="-L$PYLIB -lModules -lPython -lObjects -lParser" + break + else + if test -r "$i/lib$PYVERSION.a"; then + PYLIB="$i" + PYTHON_LIBS="-L$PYLIB -l$PYVERSION -lpthread -ldl -lutil -lm" + break + fi + fi + fi +done + +if ! test "$PYLIB"; then + AC_MSG_ERROR([Not found]) +else + AC_MSG_RESULT([$PYLIB]) +fi + +AC_SUBST([PYTHON_CFLAGS]) +AC_SUBST([PYTHON_LIBS]) -dnl Check for X headers and libraries +# 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" +CXXFLAGS="$CXXFLAGS $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 +# Check for required functions in -lX11 AC_CHECK_LIB([X11], [XOpenDisplay], , AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]) ) -dnl Check for Xft >= 2 +# Check for Xft >= 2 XFT_MIN_MAJOR=2 XFT_MIN_MINOR=0 XFT_MIN_REVISION=0 @@ -119,16 +191,16 @@ fi AC_MSG_RESULT([yes]) -dnl Store these +# Store these OLDLIBS=$LIBS -OLDCFLAGS=$CFLAGS +OLDCXXFLAGS=$CXXFLAGS 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 +# Set these for checking with the tests below. They'll be restored after LIBS="$LIBS $XFT_LIBS" -CFLAGS="$XFT_CFLAGS $CFLAGS" +CXXFLAGS="$XFT_CFLAGS $CXXFLAGS" AC_CHECK_LIB([Xft], [XftFontOpenName], AC_MSG_CHECKING([for X11/Xft/Xft.h for Xft >= $XFT_MIN]) @@ -191,14 +263,46 @@ See http://www.fontconfig.org/ ] ) ) -dnl Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's +# Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's LIBS=$OLDLIBS -CFLAGS=$OLDCFLAGS +CXXFLAGS=$OLDCXXFLAGS AC_SUBST([XFT_CFLAGS]) AC_SUBST([XFT_LIBS]) -dnl Check for XShape extension support +# Check for XKB extension support +AC_CHECK_LIB([X11], [XkbBell], + AC_MSG_CHECKING([for X11/XKBlib.h]) + AC_TRY_LINK( + [ + #include + #include + #include + ], + [ + Display *d; + Window w; + XkbBell(d, w, 0, 0); + ], + [ + AC_MSG_RESULT([yes]) + XKB="yes" + AC_DEFINE([XKB], [1], [Found the XKB extension]) + ], + [ + AC_MSG_RESULT([no]) + XKB="no" + ] + ) +) +AC_MSG_CHECKING([for the XKB extension]) +if test "$XKB" = "yes"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi + +# Check for XShape extension support AC_CHECK_LIB([Xext], [XShapeCombineShape], AC_MSG_CHECKING([for X11/extensions/shape.h]) AC_TRY_LINK( @@ -229,7 +333,7 @@ else AC_MSG_RESULT([no]) fi -dnl Check for Xinerama extension support +# Check for Xinerama extension support AC_MSG_CHECKING([whether to build support for the Xinerama extension]) XINERAMA="no" AC_ARG_ENABLE([xinerama], @@ -274,19 +378,16 @@ AC_ARG_ENABLE([xinerama], AC_MSG_RESULT([no]) ) - - -AC_CONFIG_FILES([Makefile - m4/Makefile - po/Makefile.in - intl/Makefile +AC_CONFIG_FILES([Makefile po/Makefile.in otk/Makefile src/Makefile + scripts/Makefile util/Makefile util/epist/Makefile doc/Makefile doc/doxygen/Makefile data/Makefile + data/buttons/Makefile data/styles/Makefile version.h ]) @@ -298,7 +399,7 @@ 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 '$CXXFLAGS' for C++ compiler flags.]) AC_MSG_RESULT([Building with '$LIBS' for linker flags.]) AC_MSG_RESULT AC_MSG_RESULT([configure complete, now type \"make\"])