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)
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
AC_HEADER_TIME
# Determine the return type of signal handlers
-AC_TYPE_SIGNAL
+# AC_TYPE_SIGNAL
# Check whether to include debugging code
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=])
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"
# 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])
)
# 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 <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/XKBlib.h>
+ ],
+ [
+ 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_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
doc/Makefile
doc/doxygen/Makefile
data/Makefile
+ data/buttons/Makefile
data/styles/Makefile
version.h
])
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\"])