alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* configure.ac: Call AC_GNU_SOURCE to make glibc's strsignal

Browse source 
definition visible even to non-GNU compilers.
This commit is contained in:
Alexandre Duret-Lutz 2004-07-16 16:25:38 +00:00
parent b4eda5e84d
commit 85d2b7b287
2 changed files with 149 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lbtt/ChangeLog
View file

@ -1,3 +1,8 @@
2004-07-16 Alexandre Duret-Lutz <adl@src.lip6.fr>
* configure.ac: Call AC_GNU_SOURCE to make glibc's strsignal
definition visible even to non-GNU compilers.
2004-02-11 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-02-11 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/SpotWrapper.cc (SpotWrapper::SPOT_AND, SpotWrapper::SPOT_OR): * src/SpotWrapper.cc (SpotWrapper::SPOT_AND, SpotWrapper::SPOT_OR):

223
lbtt/configure.ac
View file

@ -1,11 +1,11 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.53]) AC_PREREQ([2.59])
AC_INIT([lbtt], [1.0.3], [heikki.tauriainen@hut.fi]) AC_INIT([lbtt], [1.1.0], [heikki.tauriainen@hut.fi])
AC_REVISION([Revision: 1.3]) AC_REVISION([Revision: 1.4])
AC_CONFIG_SRCDIR([src/main.cc]) AC_CONFIG_SRCDIR([src/main.cc])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([config.h])
@ -18,31 +18,68 @@ AC_PROG_CXXCPP
AM_PROG_LEX AM_PROG_LEX
AC_PROG_YACC AC_PROG_YACC
# Check whether the user has explicitly disabled the test for the availability
# of the GNU readline library.
# Check whether the user has explicitly disabled support for the GNU readline
# library.
readline=yes readline=yes
readline_includedir=
readline_libdir=
AC_ARG_WITH([readline], AC_ARG_WITH(
[AC_HELP_STRING([--without-readline], [readline],
[disable check for the GNU readline library])], [AS_HELP_STRING(
[if test x"${withval}" = xno; then readline=no; fi]) [--without-readline],
[disable support for the GNU readline library (default enable)])],
[if test x"${withval}" = xno; then readline=no; fi])
AC_ARG_WITH(
[readline-prefix],
[AS_HELP_STRING(
[--with-readline-prefix=DIR],
[location where GNU readline is installed (optional)])],
[readline_includedir="${withval}/include"
readline_libdir="${withval}/lib"])
AC_ARG_WITH(
[readline-includes],
[AS_HELP_STRING(
[--with-readline-includes=DIR],
[location where GNU readline headers are installed (optional)])],
[readline_includedir="${withval}"])
AC_ARG_WITH(
[readline-libs],
[AS_HELP_STRING(
[--with-readline-libs=DIR],
[location where GNU readline libraries are installed (optional)])],
[readline_libdir="${withval}"])
old_CPPFLAGS=${CPPFLAGS}
old_LDFLAGS=${LDFLAGS}
if test -n "${readline_includedir}"; then
CPPFLAGS="${CPPFLAGS} -I${readline_includedir}"
fi
if test -n "${readline_libdir}"; then
LDFLAGS="${LDFLAGS} -L${readline_libdir}"
fi
# Check for the availability of headers. # Check for the availability of headers.
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h]) AC_CHECK_HEADERS([libintl.h fcntl.h sys/times.h])
AC_HEADER_SYS_WAIT
# Check for the availability of the GNU readline headers. # Check for the availability of the GNU readline headers.
if test "${readline}" = yes; then if test "${readline}" = yes; then
rl_history_h="readline/history.h" rl_history_h="readline/history.h"
rl_readline_h="readline/readline.h" rl_readline_h="readline/readline.h"
AC_CHECK_HEADERS([${rl_history_h} ${rl_readline_h}], AC_CHECK_HEADERS([${rl_history_h} ${rl_readline_h}], [], [readline=no])
[],
[readline=no])
fi fi
AC_LANG([C++]) AC_LANG([C++])
@ -51,30 +88,43 @@ AC_LANG([C++])
# version of this header that cannot be compiled using g++; enable a workaround # version of this header that cannot be compiled using g++; enable a workaround
# if necessary. # if necessary.
AC_CHECK_HEADERS([obstack.h], AC_CHECK_HEADERS(
[AC_MSG_CHECKING([whether obstack.h compilation workaround is needed]) [obstack.h],
AC_TRY_COMPILE([#include <obstack.h>], [AC_MSG_CHECKING([whether obstack.h compilation workaround is needed])
[#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3 old_cxxflags=${CXXFLAGS}
obstack_alloc(0, 0); CXXFLAGS="${CXXFLAGS} -Werror"
#endif], AC_COMPILE_IFELSE(
[AC_MSG_RESULT([no])], [AC_LANG_PROGRAM(
[AC_MSG_RESULT([yes]) [[#include <obstack.h>]],
AC_DEFINE([GLIBC_OBSTACK_WORKAROUND], [[
[1], #ifdef __GLIBC__ == 2 && __GLIBC_MINOR__ = 3
[Define to 1 to enable an obstack.h C++ compilation workaround for GNU libc 2.3.])])]) obstack_alloc(0, 0);
#endif
]])],
[AC_MSG_RESULT([no])],
[AC_MSG_RESULT([yes])
AC_DEFINE(
[GLIBC_OBSTACK_WORKAROUND],
[1],
[Define to 1 to enable an obstack.h C++ compilation workaround for GNU libc 2.3.])])
CXXFLAGS=${old_cxxflags}])
# Check for the availablility of the sstream or strstream header. # Check for the availablility of the sstream or strstream header.
AC_CHECK_HEADERS([sstream], AC_CHECK_HEADERS(
[], [sstream],
[AC_CHECK_HEADERS([strstream], [],
[], [AC_CHECK_HEADERS(
[AC_MSG_ERROR([missing one or more standard C++ headers])])]) [strstream],
[],
[AC_MSG_ERROR([missing one or more standard C++ headers])])])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_GNU_SOURCE
# Check for the availability of the slist header (an extension to the C++ # Check for the availability of the slist header (an extension to the C++
# Standard Template Library). (In GCC 3.x the header is in the ext/ # Standard Template Library). (In GCC 3.x the header is in the ext/
# subdirectory of the directory containing the standard C++ headers.) # subdirectory of the directory containing the standard C++ headers.)
@ -82,30 +132,35 @@ AC_CHECK_HEADERS([sstream],
AC_MSG_CHECKING([for slist]) AC_MSG_CHECKING([for slist])
for slist_header in slist ext/slist no; do for slist_header in slist ext/slist no; do
if test "${slist_header}" != no; then if test "${slist_header}" != no; then
AC_TRY_CPP([#include <${slist_header}>], [break]) AC_PREPROC_IFELSE(
[AC_LANG_SOURCE([[#include <${slist_header}>]])],
[break])
fi fi
done done
# Try to determine the C++ namespace in which the class slist resides. # Try to determine the C++ namespace in which the class slist resides.
# (For example, GCC versions 3.1, 3.1.1 and 3.2 put slist into the # (For example, GCC versions >= 3.1 put slist into the __gnu_cxx namespace.)
# __gnu_cxx namespace.)
if test "${slist_header}" != no; then if test "${slist_header}" != no; then
for slist_namespace in std __gnu_cxx error; do for slist_namespace in std __gnu_cxx error; do
if test "${slist_namespace}" != error; then if test "${slist_namespace}" != error; then
AC_TRY_LINK([#include <${slist_header}>], AC_COMPILE_IFELSE(
[${slist_namespace}::slist<int> s;], [AC_LANG_PROGRAM(
[break]) [[#include <${slist_header}>]],
[[${slist_namespace}::slist<int> s;]])],
[break])
fi fi
done done
if test "${slist_namespace}" != error; then if test "${slist_namespace}" != error; then
AC_MSG_RESULT([header <${slist_header}>, typename ${slist_namespace}::slist]) AC_MSG_RESULT([header <${slist_header}>, typename ${slist_namespace}::slist])
AC_DEFINE([HAVE_SLIST], AC_DEFINE(
[1], [HAVE_SLIST],
[Define to 1 if you have the <slist> or <ext/slist> header file.]) [1],
AC_DEFINE_UNQUOTED([SLIST_NAMESPACE], [Define to 1 if you have the <slist> or <ext/slist> header file.])
[${slist_namespace}], AC_DEFINE_UNQUOTED(
[Define as the name of the C++ namespace containing slist.]) [SLIST_NAMESPACE],
[${slist_namespace}],
[Define as the name of the C++ namespace containing slist.])
AC_SUBST([INCLUDE_SLIST_HEADER], ["#include <${slist_header}>"]) AC_SUBST([INCLUDE_SLIST_HEADER], ["#include <${slist_header}>"])
else else
slist_header=no slist_header=no
@ -114,27 +169,21 @@ fi
if test "${slist_header}" = no; then if test "${slist_header}" = no; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
# Check for the availability of the single_client_alloc memory allocator
# available in some compilers supporting the SGI extensions to the Standard
# template library (for example, pre-3.0 versions of gcc). This check is not
# needed if no suitable slist header was found above, since in that case the
# compiler does not support the SGI extensions.
else
AC_MSG_CHECKING([for single_client_alloc])
AC_TRY_LINK([#include <${slist_header}>],
[using namespace std;
${slist_namespace}::slist<int, single_client_alloc> s;],
[AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_SINGLE_CLIENT_ALLOC],
[1],
[Define if your C++ compiler supports the single_client_allocator memory allocator.])],
[AC_MSG_RESULT([no])])
fi fi
AC_LANG(C) AC_LANG(C)
AC_CHECK_TYPES(
[unsigned long long int],
[AC_DEFINE(
[BIGUINT],
[unsigned long long int],
[Define to an unsigned integer type supported by your compiler.])],
[AC_DEFINE(
[BIGUINT],
[unsigned long int],
[Define to an unsigned integer type supported by your compiler.])])
AC_C_CONST AC_C_CONST
AC_C_INLINE AC_C_INLINE
@ -142,12 +191,14 @@ AC_C_INLINE
# Checks for library functions. # Checks for library functions.
AC_TYPE_SIGNAL AC_CHECK_FUNCS(
AC_CHECK_FUNCS([mkdir strchr strtod strtol strtoul getopt_long isatty]) [strchr strtod strtol strtoul strerror mkdir mkstemp open read write close popen pclose pipe fork execvp getpid waitpid alarm sigaction sigprocmask sigemptyset sigaddset times sysconf],
[],
[AC_MSG_ERROR([missing one of the library functions required for compilation])])
AC_CHECK_FUNCS([strsignal isatty getopt_long])
if test x"${ac_cv_func_getopt_long}" = xno; then if test x"${ac_cv_func_getopt_long}" = xno; then
AC_LIBOBJ([getopt]) AC_LIBOBJ([getopt])
AC_LIBOBJ([getopt1]) AC_LIBOBJ([getopt1])
AC_CHECK_HEADERS([libintl.h])
AC_CHECK_FUNCS([memset]) AC_CHECK_FUNCS([memset])
fi fi
@ -159,42 +210,56 @@ if test "${readline}" = yes; then
for READLINELIBS in "-lreadline" "-lreadline -lcurses" "-lreadline -ltermcap" error; do for READLINELIBS in "-lreadline" "-lreadline -lcurses" "-lreadline -ltermcap" error; do
if test "${READLINELIBS}" != error; then if test "${READLINELIBS}" != error; then
LIBS="${oldlibs} ${READLINELIBS}" LIBS="${oldlibs} ${READLINELIBS}"
AC_TRY_LINK([#include <stdio.h> AC_LINK_IFELSE(
#include <${rl_history_h}> [AC_LANG_PROGRAM(
#include <${rl_readline_h}>], [[
[using_history(); readline(""); add_history("");], #include <stdio.h>
[break]) #include <${rl_history_h}>
#include <${rl_readline_h}>
]],
[[using_history(); readline(""); add_history("");]])],
[break])
fi fi
done done
LIBS=${oldlibs} LIBS=${oldlibs}
if test "${READLINELIBS}" != error; then if test "${READLINELIBS}" != error; then
AC_DEFINE([HAVE_READLINE], AC_DEFINE(
[1], [HAVE_READLINE],
[Define if you have the GNU readline library.]) [1],
[Define if you have the GNU readline library.])
AC_SUBST([READLINELIBS]) AC_SUBST([READLINELIBS])
AC_MSG_RESULT([${READLINELIBS}]) AC_MSG_RESULT([${READLINELIBS}])
else else
AC_MSG_RESULT([no suitable libraries found, readline support disabled]) AC_MSG_RESULT([no suitable libraries found, readline support disabled])
READLINELIBS="" READLINELIBS=""
readline=no
fi fi
fi fi
if test "${readline}" = no; then
CPPFLAGS=${old_CPPFLAGS}
LDFLAGS=${old_LDFLAGS}
fi
# Check for the availability of the `rand48' family of random number # Check for the availability of the `rand48' family of random number
# generation functions. # generation functions.
have_rand48=yes have_rand48=yes
AC_CHECK_FUNCS([srand48 lrand48 seed48], AC_CHECK_FUNCS(
[], [srand48 lrand48 seed48],
[have_rand48=no [],
AC_CHECK_FUNCS([rand srand], [have_rand48=no
[], AC_CHECK_FUNCS(
[AC_MSG_ERROR([missing library functions for random number generation])])]) [rand srand],
[],
[AC_MSG_ERROR([missing library functions for random number generation])])])
if test "${have_rand48}" = yes; then if test "${have_rand48}" = yes; then
AC_DEFINE([HAVE_RAND48], AC_DEFINE(
[1], [HAVE_RAND48],
[Define if you have the `rand48' family of random number generation functions.]) [1],
[Define if you have the `rand48' family of random number generation functions.])
fi fi