Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-18 10:26:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update some m4 macros with the latest available version

Browse source
This commit is contained in:
Olivier Teulière 2013-01-06 17:17:23 +01:00
parent 91c993073e
commit 0c87ae7cde
5 changed files with 226 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
m4/ax_boost_base.m4
View file

@ -1,17 +1,19 @@
##### http://autoconf-archive.cryp.to/ax_boost_base.html # ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
# ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
# #
# AX_BOOST_BASE([MINIMUM-VERSION]) # AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# #
# DESCRIPTION # DESCRIPTION
# #
# Test for the Boost C++ libraries of a particular version (or newer) # Test for the Boost C++ libraries of a particular version (or newer)
# #
# If no path to the installed boost library is given the macro # If no path to the installed boost library is given the macro searchs
# searchs under /usr, /usr/local, and /opt, and evaluates the # under /usr, /usr/local, /opt and /opt/local and evaluates the
# $BOOST_ROOT environment variable. Further documentation is # $BOOST_ROOT environment variable. Further documentation is available at
# available at <http://randspringer.de/boost/index.html>. # <http://randspringer.de/boost/index.html>.
# #
# This macro calls: # This macro calls:
# #
@ -21,22 +23,26 @@
# #
# HAVE_BOOST # HAVE_BOOST
# #
# LAST MODIFICATION # LICENSE
# #
# 2007-03-15 # Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
# Copyright (c) 2009 Peter Adolphs
# #
# COPYLEFT # Copying and distribution of this file, with or without modification, are
# # permitted in any medium without royalty provided the copyright notice
# Copyright (c) 2007 Thomas Porschberg <thomas@randspringer.de> # and this notice are preserved. This file is offered as-is, without any
# # warranty.
# Copying and distribution of this file, with or without
# modification, are permitted in any medium without royalty provided #serial 20
# the copyright notice and this notice are preserved.
AC_DEFUN([AX_BOOST_BASE], AC_DEFUN([AX_BOOST_BASE],
[ [
AC_ARG_WITH([boost], AC_ARG_WITH([boost],
AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) - it is possible to specify the root directory for boost (optional)]), [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
[use Boost library from a standard location (ARG=yes),
from the specified location (ARG=<path>),
or disable it (ARG=no)
@<:@ARG=yes@:>@ ])],
[ [
if test "$withval" = "no"; then if test "$withval" = "no"; then
want_boost="no" want_boost="no"
@ -50,6 +56,21 @@ AC_ARG_WITH([boost],
], ],
[want_boost="yes"]) [want_boost="yes"])
AC_ARG_WITH([boost-libdir],
AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
[Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),
[
if test -d "$withval"
then
ac_boost_lib_path="$withval"
else
AC_MSG_ERROR(--with-boost-libdir expected directory name)
fi
],
[ac_boost_lib_path=""]
)
if test "x$want_boost" = "xyes"; then if test "x$want_boost" = "xyes"; then
boost_lib_version_req=ifelse([$1], ,1.20.0,$1) boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'` boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
@ -63,22 +84,47 @@ if test "x$want_boost" = "xyes"; then
AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
succeeded=no succeeded=no
dnl On 64-bit systems check for system libraries in both lib64 and lib.
dnl The former is specified by FHS, but e.g. Debian does not adhere to
dnl this (as it rises problems for generic multi-arch support).
dnl The last entry in the list is chosen by default when no libraries
dnl are found, e.g. when only header-only libraries are installed!
libsubdirs="lib"
ax_arch=`uname -m`
if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
libsubdirs="lib64 lib lib64"
fi
dnl first we check the system location for boost libraries dnl first we check the system location for boost libraries
dnl this location ist chosen if boost libraries are installed with the --layout=system option dnl this location ist chosen if boost libraries are installed with the --layout=system option
dnl or if you install boost with RPM dnl or if you install boost with RPM
if test "$ac_boost_path" != ""; then if test "$ac_boost_path" != ""; then
BOOST_LDFLAGS="-L$ac_boost_path/lib"
BOOST_CPPFLAGS="-I$ac_boost_path/include" BOOST_CPPFLAGS="-I$ac_boost_path/include"
else for ac_boost_path_tmp in $libsubdirs; do
for ac_boost_path_tmp in /usr /usr/local /opt ; do if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
break
fi
done
elif test "$cross_compiling" != yes; then
for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" for libsubdir in $libsubdirs ; do
if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
done
BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
break; break;
fi fi
done done
fi fi
dnl overwrite ld flags if we have required special directory with
dnl --with-boost-libdir parameter
if test "$ac_boost_lib_path" != ""; then
BOOST_LDFLAGS="-L$ac_boost_lib_path"
fi
CPPFLAGS_SAVED="$CPPFLAGS" CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS export CPPFLAGS
@ -87,6 +133,7 @@ if test "x$want_boost" = "xyes"; then
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS export LDFLAGS
AC_REQUIRE([AC_PROG_CXX])
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@%:@include <boost/version.hpp> @%:@include <boost/version.hpp>
@ -111,7 +158,6 @@ if test "x$want_boost" = "xyes"; then
if test "x$succeeded" != "xyes"; then if test "x$succeeded" != "xyes"; then
_version=0 _version=0
if test "$ac_boost_path" != ""; then if test "$ac_boost_path" != ""; then
BOOST_LDFLAGS="-L$ac_boost_path/lib"
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
@ -124,7 +170,8 @@ if test "x$want_boost" = "xyes"; then
done done
fi fi
else else
for ac_boost_path in /usr /usr/local /opt ; do if test "$cross_compiling" != yes; then
for ac_boost_path in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
_version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
@ -139,18 +186,27 @@ if test "x$want_boost" = "xyes"; then
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
BOOST_LDFLAGS="-L$best_path/lib" if test "$ac_boost_lib_path" = ""; then
for libsubdir in $libsubdirs ; do
if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
done
BOOST_LDFLAGS="-L$best_path/$libsubdir"
fi
fi
if test "x$BOOST_ROOT" != "x"; then if test "x$BOOST_ROOT" != "x"; then
if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then for libsubdir in $libsubdirs ; do
if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
done
if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'` stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
V_CHECK=`expr $stage_version_shorten \>\= $_version` V_CHECK=`expr $stage_version_shorten \>\= $_version`
if test "$V_CHECK" = "1" ; then if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
BOOST_CPPFLAGS="-I$BOOST_ROOT" BOOST_CPPFLAGS="-I$BOOST_ROOT"
BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
fi fi
fi fi
fi fi
@ -181,14 +237,18 @@ if test "x$want_boost" = "xyes"; then
if test "$succeeded" != "yes" ; then if test "$succeeded" != "yes" ; then
if test "$_version" = "0" ; then if test "$_version" = "0" ; then
AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]]) AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
else else
AC_MSG_ERROR([Your boost libraries is too old (version $_version).]) AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
fi fi
# execute ACTION-IF-NOT-FOUND (if present):
ifelse([$3], , :, [$3])
else else
AC_SUBST(BOOST_CPPFLAGS) AC_SUBST(BOOST_CPPFLAGS)
AC_SUBST(BOOST_LDFLAGS) AC_SUBST(BOOST_LDFLAGS)
AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
# execute ACTION-IF-FOUND (if present):
ifelse([$2], , :, [$2])
fi fi
CPPFLAGS="$CPPFLAGS_SAVED" CPPFLAGS="$CPPFLAGS_SAVED"

1
m4/ax_cxx_gcc_abi_demangle.m4
View file

@ -33,7 +33,6 @@ ax_cv_cxx_gcc_abi_demangle,
AC_TRY_COMPILE([#include <typeinfo> AC_TRY_COMPILE([#include <typeinfo>
#include <cxxabi.h> #include <cxxabi.h>
#include <string> #include <string>
#include <cstdlib>
template<typename TYPE> template<typename TYPE>
class A {}; class A {};

27
m4/ax_lib_expat.m4
View file

@ -1,5 +1,5 @@
# =========================================================================== # ===========================================================================
# http://www.nongnu.org/autoconf-archive/ax_lib_expat.html # http://www.gnu.org/software/autoconf-archive/ax_lib_expat.html
# =========================================================================== # ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
@ -28,7 +28,7 @@
# This macro calls: # This macro calls:
# #
# AC_SUBST(EXPAT_CFLAGS) # AC_SUBST(EXPAT_CFLAGS)
# AC_SUBST(EXPAT_LDFLAGS) # AC_SUBST(EXPAT_LIBS)
# AC_SUBST(EXPAT_VERSION) -- only if version requirement is used # AC_SUBST(EXPAT_VERSION) -- only if version requirement is used
# #
# And sets: # And sets:
@ -41,12 +41,15 @@
# #
# Copying and distribution of this file, with or without modification, are # Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice # permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. # and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 9
AC_DEFUN([AX_LIB_EXPAT], AC_DEFUN([AX_LIB_EXPAT],
[ [
AC_ARG_WITH([expat], AC_ARG_WITH([expat],
AC_HELP_STRING([--with-expat=@<:@ARG@:>@], AS_HELP_STRING([--with-expat=@<:@ARG@:>@],
[use Expat XML Parser from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)] [use Expat XML Parser from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)]
), ),
[ [
@ -80,14 +83,14 @@ AC_DEFUN([AX_LIB_EXPAT],
) )
AC_ARG_WITH([expat-inc], AC_ARG_WITH([expat-inc],
AC_HELP_STRING([--with-expat-inc=@<:@DIR@:>@], AS_HELP_STRING([--with-expat-inc=@<:@DIR@:>@],
[path to Expat XML Parser headers] [path to Expat XML Parser headers]
), ),
[expat_include_dir="$withval"], [expat_include_dir="$withval"],
[expat_include_dir=""] [expat_include_dir=""]
) )
AC_ARG_WITH([expat-lib], AC_ARG_WITH([expat-lib],
AC_HELP_STRING([--with-expat-lib=@<:@ARG@:>@], AS_HELP_STRING([--with-expat-lib=@<:@ARG@:>@],
[link options for Expat XML Parser libraries] [link options for Expat XML Parser libraries]
), ),
[expat_lib_flags="$withval"], [expat_lib_flags="$withval"],
@ -95,7 +98,7 @@ AC_DEFUN([AX_LIB_EXPAT],
) )
EXPAT_CFLAGS="" EXPAT_CFLAGS=""
EXPAT_LDFLAGS="" EXPAT_LIBS=""
EXPAT_VERSION="" EXPAT_VERSION=""
dnl dnl
@ -123,8 +126,8 @@ AC_DEFUN([AX_LIB_EXPAT],
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$expat_include_dir" CPPFLAGS="$CPPFLAGS -I$expat_include_dir"
saved_LIBS="$LIBS" saved_LDFLAGS="$LDFLAGS"
LIBS="$LIBS $expat_lib_flags" LIBS="$LDFLAGS $expat_lib_flags"
dnl dnl
dnl Check Expat headers dnl Check Expat headers
@ -171,7 +174,7 @@ p = NULL;
]] ]]
)], )],
[ [
EXPAT_LDFLAGS="$expat_lib_flags" EXPAT_LIBS="$expat_lib_flags"
expat_lib_found="yes" expat_lib_found="yes"
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
], ],
@ -184,7 +187,7 @@ p = NULL;
fi fi
CPPFLAGS="$saved_CPPFLAGS" CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_LIBS" LDFLAGS="$saved_LDFLAGS"
fi fi
AC_MSG_CHECKING([for Expat XML Parser]) AC_MSG_CHECKING([for Expat XML Parser])
@ -193,7 +196,7 @@ p = NULL;
if test "$expat_header_found" = "yes" -a "$expat_lib_found" = "yes"; then if test "$expat_header_found" = "yes" -a "$expat_lib_found" = "yes"; then
AC_SUBST([EXPAT_CFLAGS]) AC_SUBST([EXPAT_CFLAGS])
AC_SUBST([EXPAT_LDFLAGS]) AC_SUBST([EXPAT_LIBS])
HAVE_EXPAT="yes" HAVE_EXPAT="yes"
else else

2
qt/Makefile.am
View file

@ -141,7 +141,7 @@ BUILT_SOURCES = $(nodist_eliot_SOURCES)
MOSTLYCLEANFILES = $(nodist_eliot_SOURCES) MOSTLYCLEANFILES = $(nodist_eliot_SOURCES)
eliot_LDADD = ../game/libgame.a ../dic/libdic.a @QT_LIBS@ @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LDFLAGS@ eliot_LDADD = ../game/libgame.a ../dic/libdic.a @QT_LIBS@ @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
# Needed for proper stack trace handling # Needed for proper stack trace handling
eliot_LDFLAGS = -rdynamic eliot_LDFLAGS = -rdynamic

4
utils/Makefile.am
View file

@ -25,7 +25,7 @@ bin_PROGRAMS =
if BUILD_TEXT if BUILD_TEXT
noinst_PROGRAMS += eliottxt noinst_PROGRAMS += eliottxt
eliottxt_SOURCES = game_io.h game_io.cpp eliottxt.cpp eliottxt_SOURCES = game_io.h game_io.cpp eliottxt.cpp
eliottxt_LDADD = $(top_builddir)/game/libgame.a $(top_builddir)/dic/libdic.a @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LDFLAGS@ eliottxt_LDADD = $(top_builddir)/game/libgame.a $(top_builddir)/dic/libdic.a @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
if HAS_READLINE if HAS_READLINE
eliottxt_LDADD += -lreadline eliottxt_LDADD += -lreadline
@ -38,7 +38,7 @@ endif
if BUILD_NCURSES if BUILD_NCURSES
bin_PROGRAMS += eliotcurses bin_PROGRAMS += eliotcurses
eliotcurses_SOURCES = ncurses.cpp ncurses.h eliotcurses_SOURCES = ncurses.cpp ncurses.h
eliotcurses_LDADD = ../game/libgame.a ../dic/libdic.a -lncursesw @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LDFLAGS@ eliotcurses_LDADD = ../game/libgame.a ../dic/libdic.a -lncursesw @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
if WITH_LOGGING if WITH_LOGGING
eliotcurses_LDADD += @LOG4CXX_LIBS@ eliotcurses_LDADD += @LOG4CXX_LIBS@
endif endif