X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=f68796e8440a4030bdb09f8daf63d44b134720cc;hb=385de86d903c95e9897bd106b04e3ef1f70d9d2d;hp=6b17785683e8353373ade1ef1b24ebf674f829b7;hpb=bf49e7642027f576716e5742544c282f4396f9ef;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 6b177856..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]) -# AC_LANG(C++) +AC_LANG(C++) # 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,11 +35,11 @@ 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 @@ -50,7 +54,7 @@ AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h AC_HEADER_TIME # Determine the return type of signal handlers -AC_TYPE_SIGNAL +# AC_TYPE_SIGNAL # Check whether to include debugging code DEBUG="" @@ -71,11 +75,11 @@ AC_ARG_ENABLE([debug], AC_MSG_RESULT([no]) DEBUG="-DNDEBUG" ) -CFLAGS="$CFLAGS $DEBUG" +CXXFLAGS="$CXXFLAGS $DEBUG" # Check for Python AC_ARG_WITH([python], - [ --with-python=path Set location of Python executable], + [ --with-python=path Set location of Python executable], [PYTHON="$withval"], [PYTHON=]) @@ -119,28 +123,38 @@ else AC_MSG_RESULT([$PYTHON_CFLAGS]) fi -# Set the library directory blindly. This probably won't work with older versions +# Find the python library +PYTHON_LIBS="" AC_MSG_CHECKING([for Python library]) -dirs="$PYVERSION/config $PYVERSION/lib python/lib" +dirs="$PYEPREFIX/lib $PYEPREFIX/lib/$PYVERSION/config \ + $PYEPREFIX/lib/$PYVERSION/lib $PYEPREFIX/lib/python/lib" for i in $dirs; do - if test -d "$PYEPREFIX/lib/$i"; then - PYLIB="$PYEPREFIX/lib/$i" - break + # 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 -# Check for really old versions -if test -r "$PYLIB/libPython.a"; then - PYTHON_LIBS="-L$PYLIB -lModules -lPython -lObjects -lParser" -else - PYTHON_LIBS="-L$PYLIB -l$PYVERSION" -fi - AC_SUBST([PYTHON_CFLAGS]) AC_SUBST([PYTHON_LIBS]) @@ -151,7 +165,7 @@ 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" @@ -179,14 +193,14 @@ AC_MSG_RESULT([yes]) # Store these OLDLIBS=$LIBS -OLDCFLAGS=$CFLAGS +OLDCXXFLAGS=$CXXFLAGS XFT_CFLAGS="`pkg-config --cflags xft`" XFT_LIBS="`pkg-config --libs xft`" # 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]) @@ -251,11 +265,43 @@ See http://www.fontconfig.org/ ) # 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]) +# 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]) @@ -332,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 ]) @@ -356,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\"])