-AC_INIT(src/blackbox.cc)
-AM_INIT_AUTOMAKE(openbox, 2.90.0, no-define)
-
-dnl Check for check
-AM_PATH_CHECK
+AC_INIT
+AC_CONFIG_SRCDIR([src/main.cc])
+AM_INIT_AUTOMAKE([openbox], [2.90.0])
dnl Determine default prefix
test "$prefix" = "NONE" && prefix="$ac_default_prefix"
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
-dnl AC_PROG_LIBTOOL dont need this until we're doing plugins/engines
+AC_PROG_LIBTOOL
-AC_CHECK_PROGS(regex_cmd, sed)
+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
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)
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
dnl Determine the return type of signal handlers
AC_TYPE_SIGNAL
+dnl Look for gettext, using external libintl
+AM_GNU_GETTEXT([external])
+
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
AC_MSG_RESULT([no])
DEBUG="-DNDEBUG"
)
-CXXFLAGS="$CXXFLAGS $DEBUG"
+CPPFLAGS="$CPPFLAGS $DEBUG"
dnl Check for X headers and libraries
AC_PATH_X
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 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 <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/extensions/shape.h>],
- 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 <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/extensions/shape.h>
+ ],
+ [
+ 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"
+ ]
)
)
AC_MSG_CHECKING([for the XShape extension])
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 <X11/Xlib.h>
- #include <X11/extensions/Xinerama.h>],
- 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 <X11/Xlib.h>
+ #include <X11/extensions/Xinerama.h>
+ ],
+ [
+ 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])
AC_MSG_RESULT([no])
)
-dnl Print results
-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 '$LIBS' for linker flags.])
-AC_MSG_RESULT([])
-
-
dnl Output files
AM_CONFIG_HEADER(config.h)
-AC_OUTPUT(
- version.h
+AC_CONFIG_FILES([
Makefile
+ m4/Makefile
+ po/Makefile.in
+ otk/Makefile
src/Makefile
util/Makefile
util/epist/Makefile
doc/Makefile
data/Makefile
data/styles/Makefile
-)
+ version.h
+])
+AC_OUTPUT
+
+dnl Print results
+AC_MSG_RESULT([])
+AC_MSG_RESULT([ $PACKAGE_NAME version $PACKAGE_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 '$LIBS' for linker flags.])
+AC_MSG_RESULT([])
\ No newline at end of file
projects / chaz / openbox / blobdiff