X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=12554079acfad11642e3366e3f8ebc5138dccc1a;hb=5a139f7263e33b499836f5df9ac37400e02c32f9;hp=6b5537e62d1e32be21453d8078e18cfd6be0188d;hpb=fcbb82770cb8d0b727e697830d96c9e131da03a2;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 6b5537e6..12554079 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AM_INIT_AUTOMAKE([openbox], [2.90.0cvs]) AC_PREREQ([2.50]) AC_PATH_PROG([regex_cmd], [sed]) -test -z $regex_cmd && AC_MSG_ERROR([sed not found]) +test "$regex_cmd" || AC_MSG_ERROR([sed not found]) AC_PROG_CC AC_PROG_CXX @@ -16,13 +16,13 @@ AC_PROG_INSTALL ALL_LINGUAS="" AM_GNU_GETTEXT -AC_LANG(C++) +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]) - CPPFLAGS="$CPPFLAGS -Wall -W -pedantic" + CFLAGS="$CFLAGS -Wall -W -pedantic" else AC_MSG_RESULT([no, trying other compilers]) AC_MSG_CHECKING(for MIPSpro) @@ -31,11 +31,11 @@ else AC_MSG_RESULT([no]) else AC_MSG_RESULT([yes, version $mips_pro_ver.]) - AC_MSG_CHECKING(for -LANG:std in CPPFLAGS) - lang_std_not_set=`echo $CPPFLAGS | grep "\-LANG:std"` + 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.]) - CPPFLAGS="${CPPFLAGS} -LANG:std" + CFLAGS="${CFLAGS} -LANG:std" else AC_MSG_RESULT([already set.]) fi @@ -71,7 +71,26 @@ AC_ARG_ENABLE([debug], AC_MSG_RESULT([no]) DEBUG="-DNDEBUG" ) -CPPFLAGS="$CPPFLAGS $DEBUG" +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 @@ -80,7 +99,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" -CPPFLAGS="$CPPFLAGS $X_CPPFLAGS" +CFLAGS="$CFLAGS $X_CFLAGS" LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS" LDFLAGS="$LDFLAGS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" @@ -91,36 +110,81 @@ AC_CHECK_LIB([X11], [XOpenDisplay], ) -dnl Check for Xft2 -AC_MSG_CHECKING([for Xft version 2]) +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/ +]) +fi + +AC_MSG_RESULT([yes]) + dnl Store these OLDLIBS=$LIBS -OLDCPPFLAGS=$CPPFLAGS -XFT2="" -XFT_CFLAGS="" -XFT_LIBS="" -if pkg-config xft; then - AC_MSG_RESULT([yes]) - XFT_CFLAGS="`pkg-config --cflags xft`" - XFT_LIBS="`pkg-config --libs xft`" +OLDCFLAGS=$CFLAGS - dnl Set these for checking with the tests below. They'll be restored after - LIBS="$LIBS $XFT_LIBS" - CPPFLAGS="$XFT_CFLAGS $CPPFLAGS" -else - dnl This is for Xft version 1 - XFT_LIBS="-lXft" - AC_MSG_RESULT([no]) -fi +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_CHECK_LIB([Xft], [XftFontOpenXlfd], - AC_MSG_CHECKING([for X11/Xft/Xft.h]) + AC_MSG_CHECKING([if we can compile with Xft]) AC_TRY_LINK( [ #include #include ], [ + int i = XFT_MAJOR; XftFont foo ], [ @@ -128,15 +192,14 @@ AC_CHECK_LIB([Xft], [XftFontOpenXlfd], ], [ AC_MSG_RESULT([no]) - AC_MSG_ERROR([Openbox requires the Xft font library. -See http://www.fontconfig.org/ + AC_MSG_ERROR([Unable to compile with the Xft library. ]) ] ) ) dnl Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's LIBS=$OLDLIBS -CPPFLAGS=$OLDCPPFLAGS +CFLAGS=$OLDCFLAGS AC_SUBST([XFT_CFLAGS]) AC_SUBST([XFT_LIBS]) @@ -241,8 +304,8 @@ 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 '$CPPFLAGS' for C++ compiler flags.]) +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 \ No newline at end of file +AC_MSG_RESULT