X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=configure.ac;h=6b5537e62d1e32be21453d8078e18cfd6be0188d;hb=5be1363981349a23637da6a6fc718ae48a7a6667;hp=1773de5a452ebdb4ba2ddd7da913237f342bf532;hpb=19fa297af2c2bdd089d0aaaa5d41ca05cbff3251;p=chaz%2Fopenbox diff --git a/configure.ac b/configure.ac index 1773de5a..6b5537e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,29 +1,28 @@ -AC_INIT(src/blackbox.cc) -AM_INIT_AUTOMAKE(openbox, 2.90.0, no-define) - -dnl Check for check -AM_PATH_CHECK +AC_INIT([src/main.cc]) +AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE([openbox], [2.90.0cvs]) -dnl Determine default prefix -test "$prefix" = "NONE" && prefix="$ac_default_prefix" +AC_PREREQ([2.50]) -dnl We're in the C++ world -AC_LANG(C++) +AC_PATH_PROG([regex_cmd], [sed]) +test -z $regex_cmd && AC_MSG_ERROR([sed not found]) +AC_PROG_CC AC_PROG_CXX +AC_PROG_LIBTOOL +LIBTOOL="$LIBTOOL --silent" AC_PROG_INSTALL -dnl AC_PROG_LIBTOOL dont need this until we're doing plugins/engines -AC_CHECK_PROGS(regex_cmd, sed) -if test x$regex_cmd = "x"; then - AC_MSG_ERROR([error. sed is required to build the default menu file.]) -fi +ALL_LINGUAS="" +AM_GNU_GETTEXT +AC_LANG(C++) + dnl Check what compiler we are using -AC_MSG_CHECKING(for GCC) +AC_MSG_CHECKING([for GCC]) if test "$GCC" = "yes"; then AC_MSG_RESULT([yes]) - CXXFLAGS="$CXXFLAGS -Wall -W -pedantic" + CPPFLAGS="$CPPFLAGS -Wall -W -pedantic" else AC_MSG_RESULT([no, trying other compilers]) AC_MSG_CHECKING(for MIPSpro) @@ -32,11 +31,11 @@ else AC_MSG_RESULT([no]) else AC_MSG_RESULT([yes, version $mips_pro_ver.]) - AC_MSG_CHECKING(for -LANG:std in CXXFLAGS) - lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"` + AC_MSG_CHECKING(for -LANG:std in CPPFLAGS) + lang_std_not_set=`echo $CPPFLAGS | grep "\-LANG:std"` if test "x$lang_std_not_set" = "x"; then AC_MSG_RESULT([not set, setting.]) - CXXFLAGS="${CXXFLAGS} -LANG:std" + CPPFLAGS="${CPPFLAGS} -LANG:std" else AC_MSG_RESULT([already set.]) fi @@ -56,8 +55,8 @@ AC_TYPE_SIGNAL 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]], +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 @@ -72,7 +71,7 @@ AC_ARG_ENABLE(debug, AC_MSG_RESULT([no]) DEBUG="-DNDEBUG" ) -CXXFLAGS="$CXXFLAGS $DEBUG" +CPPFLAGS="$CPPFLAGS $DEBUG" dnl Check for X headers and libraries AC_PATH_X @@ -81,32 +80,89 @@ 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" -CXXFLAGS="$CXXFLAGS $X_CXXFLAGS" +CPPFLAGS="$CPPFLAGS $X_CPPFLAGS" 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_CHECK_LIB([X11], [XOpenDisplay], , AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.]) ) + +dnl Check for Xft2 +AC_MSG_CHECKING([for Xft version 2]) +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`" + + 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 + +AC_CHECK_LIB([Xft], [XftFontOpenXlfd], + AC_MSG_CHECKING([for X11/Xft/Xft.h]) + AC_TRY_LINK( + [ + #include + #include + ], + [ + XftFont foo + ], + [ + AC_MSG_RESULT([yes]) + ], + [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([Openbox requires the Xft font library. +See http://www.fontconfig.org/ +]) + ] + ) +) +dnl Restore the old values. Use XFT_CFLAGS and XFT_LIBS in the Makefile.am's +LIBS=$OLDLIBS +CPPFLAGS=$OLDCPPFLAGS + +AC_SUBST([XFT_CFLAGS]) +AC_SUBST([XFT_LIBS]) + dnl Check for XShape extension support -AC_CHECK_LIB(Xext, XShapeCombineShape, +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(HAVE_SHAPE,1,Found the XShape extension) - LIBS="$LIBS -lXext", - - AC_MSG_RESULT([no]) - SHAPE="no" + [ + #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" + ] ) ) AC_MSG_CHECKING([for the XShape extension]) @@ -119,25 +175,34 @@ 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]], +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_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]) @@ -152,26 +217,32 @@ AC_ARG_ENABLE(xinerama, AC_MSG_RESULT([no]) ) -dnl Print results -AC_MSG_RESULT([]) -AC_MSG_RESULT([ $PACKAGE version $VERSION configured successfully.]) -AC_MSG_RESULT([]) + + +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 + ]) +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 '$CXXFLAGS' for C++ compiler flags.]) +AC_MSG_RESULT([Building with '$CPPFLAGS' for C++ compiler flags.]) AC_MSG_RESULT([Building with '$LIBS' for linker flags.]) -AC_MSG_RESULT([]) - - -dnl Output files -AM_CONFIG_HEADER(config.h) -AC_OUTPUT( - version.h - Makefile - src/Makefile - util/Makefile - util/epist/Makefile - doc/Makefile - data/Makefile - data/styles/Makefile -) +AC_MSG_RESULT +AC_MSG_RESULT([configure complete, now type \"make\"]) +AC_MSG_RESULT \ No newline at end of file