--- aclocal.m4 2002/01/27 11:03:40 1.92
+++ aclocal.m4 2002/01/30 12:54:21 1.93
@@ -22,7 +22,6 @@
dnl ##
dnl ## aclocal.m4: Pth Autoconf macros
dnl ##
-divert(-1)
dnl # ``"Reuse an expert's code" is the right
dnl # advice for most people. But it's a useless
dnl # advice for the experts writing the code
@@ -32,11 +31,11 @@
dnl ##
dnl ## Display Configuration Headers
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_MSG_PART(<text>)
dnl ##
-define(AC_MSG_PART,[dnl
+m4_define(AC_MSG_PART,[dnl
if test ".$enable_subdir" != .yes; then
AC_MSG_RESULT()
AC_MSG_RESULT(${TB}$1:${TN})
@@ -46,11 +45,11 @@
dnl ##
dnl ## Display a message under --verbose
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_MSG_VERBOSE(<text>)
dnl ##
-define(AC_MSG_VERBOSE,[dnl
+m4_define(AC_MSG_VERBOSE,[dnl
if test ".$verbose" = .yes; then
AC_MSG_RESULT([ $1])
fi
@@ -59,12 +58,12 @@
dnl ##
dnl ## Do not display message for a command
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_MSG_SILENT(...)
dnl ##
-define(AC_FD_TMP, 9)
-define(AC_MSG_SILENT,[dnl
+m4_define(AC_FD_TMP, 9)
+m4_define(AC_MSG_SILENT,[dnl
exec AC_FD_TMP>&AC_FD_MSG AC_FD_MSG>/dev/null
$1
exec AC_FD_MSG>&AC_FD_TMP AC_FD_TMP>&-
@@ -73,13 +72,13 @@
dnl ##
dnl ## Perform something only once
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_ONCE(<action>)
dnl ##
-define(AC_ONCE,[
+m4_define(AC_ONCE,[
ifelse(ac_once_$1, already_done, ,[
- define(ac_once_$1, already_done)
+ m4_define(ac_once_$1, already_done)
$2
])dnl
])
@@ -87,7 +86,7 @@
dnl ##
dnl ## Support for $(S)
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_SRCDIR_PREFIX(<varname>)
dnl ##
@@ -115,7 +114,7 @@
dnl ##
dnl ## Support for --enable-subdir (for use with pth.m4)
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_ENABLESUBDIR
dnl ##
@@ -134,14 +133,14 @@
dnl ##
dnl ## Support for Configuration Headers
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_HEADLINE(<short-name>, <long-name>,
dnl ## <vers-var>, <vers-file>,
dnl ## <copyright>)
dnl ##
AC_DEFUN(AC_HEADLINE,[dnl
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+AC_DIVERT_PUSH(NOTICE)dnl
# configuration header
if test ".`echo dummy [$]@ | grep enable-subdir`" != .; then
enable_subdir=yes
@@ -184,15 +183,13 @@
dnl ##
dnl ## Support for Platform IDs
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_PLATFORM(<variable>)
dnl ##
AC_DEFUN(AC_PLATFORM,[
-if test ".$host" != .NONE; then
+if test ".$host" != .; then
$1="$host"
-elif test ".$nonopt" != .NONE; then
- $1="$nonopt"
else
$1=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess`
fi
@@ -206,15 +203,15 @@
dnl ##
dnl ## Support for config.param files
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CONFIG_PARAM(<file>)
dnl ##
AC_DEFUN(AC_CONFIG_PARAM,[
AC_DIVERT_PUSH(-1)
-AC_ARG_WITH(param,[ --with-param=ID[,ID,..] load parameters from $1])
+AC_ARG_WITH(param,[ --with-param=ID[[,ID,..]] load parameters from $1])
AC_DIVERT_POP()
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)
+AC_DIVERT_PUSH(NOTICE)
ac_prev=""
ac_param=""
if test -f $1; then
@@ -294,7 +291,7 @@
dnl ##
dnl ## Check whether compiler option works
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_COMPILER_OPTION(<name>, <display>, <option>,
dnl ## <action-success>, <action-failure>)
dnl ##
@@ -324,90 +321,53 @@
dnl ##
dnl ## Check whether `long long' and `long double' type exists
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_LONGLONG
dnl ## AC_CHECK_LONGDOUBLE
dnl ##
AC_DEFUN(AC_CHECK_LONGLONG,[dnl
AC_MSG_CHECKING(for built-in type long long)
- AC_CACHE_VAL(ac_cv_type_longlong,[
+ AC_CACHE_VAL(ac_cv_type_longlong,[dnl
AC_TRY_LINK([
#include <sys/types.h>
],[
long long X = 2, Y = 1, Z;
Z = X / Y;
],
- AC_DEFINE(HAVE_LONGLONG)
ac_cv_type_longlong=yes,
ac_cv_type_longlong=no
)dnl
])dnl
AC_MSG_RESULT([$ac_cv_type_longlong])
+if test ".$ac_cv_type_longlong" = .yes; then
+ AC_DEFINE(HAVE_LONGLONG)
+fi
])dnl
AC_DEFUN(AC_CHECK_LONGDOUBLE,[dnl
AC_MSG_CHECKING(for built-in type long double)
- AC_CACHE_VAL(ac_cv_type_longdouble,[
+ AC_CACHE_VAL(ac_cv_type_longdouble,[dnl
AC_TRY_LINK([
#include <sys/types.h>
],[
long double X = 2, Y = 1, Z;
Z = X / Y;
],
- AC_DEFINE(HAVE_LONGDOUBLE)
ac_cv_type_longdouble=yes,
ac_cv_type_longdouble=no
)dnl
])dnl
AC_MSG_RESULT([$ac_cv_type_longdouble])
-])dnl
-
-dnl ##
-dnl ## Minimalistic Libtool Glue Code
-dnl ##
-dnl ## configure.in:
-dnl ## AC_PROG_LIBTOOL(<platform-variable>)
-dnl ##
-
-AC_DEFUN(AC_PROG_LIBTOOL,[dnl
-AC_ARG_ENABLE(static,dnl
-[ --enable-static build static libraries (default=yes)],
-enable_static="$enableval",
-if test ".$enable_static" = .; then
- enable_static=yes
-fi
-)dnl
-AC_ARG_ENABLE(shared,dnl
-[ --enable-shared build shared libraries (default=yes)],
-enable_shared="$enableval",
-if test ".$enable_shared" = .; then
- enable_shared=yes
+if test ".$ac_cv_type_longdouble" = .yes; then
+ AC_DEFINE(HAVE_LONGDOUBLE)
fi
-)dnl
-case "$PLATFORM" in
- # Solaris 2.7/x86 is slightly broken
- *-pc-solaris2.[[78]] [)] enable_shared=no ;;
-esac
-libtool_flags=''
-dnl libtool_flags="$libtool_flags --cache-file=$cache_file"
-libtool_flags="$libtool_flags --disable-lock"
-test ".$silent" = .yes && libtool_flags="$libtool_flags --silent"
-test ".$enable_static" = .no && libtool_flags="$libtool_flags --disable-static"
-test ".$enable_shared" = .no && libtool_flags="$libtool_flags --disable-shared"
-test ".$ac_cv_prog_gcc" = .yes && libtool_flags="$libtool_flags --with-gcc"
-test ".$ac_cv_prog_gnu_ld" = .yes && libtool_flags="$libtool_flags --with-gnu-ld"
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" \
-${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig --no-reexec \
-$libtool_flags --srcdir=$srcdir --no-verify $srcdir/ltmain.sh $1 ||\
-AC_MSG_ERROR([libtool configuration failed])
-dnl (AC_CACHE_LOAD) >/dev/null 2>&1
])dnl
dnl ##
dnl ## Debugging Support
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_DEBUGGING
dnl ##
@@ -472,7 +432,7 @@
dnl ##
dnl ## Profiling Support
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_PROFILING
dnl ##
@@ -500,7 +460,7 @@
dnl ##
dnl ## Build Parameters
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_BUILDPARAM
dnl ##
@@ -546,7 +506,7 @@
dnl ##
dnl ## Optimization Support
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_OPTIMIZE
dnl ##
@@ -595,7 +555,7 @@
dnl ##
dnl ## Check for a pre-processor define in a header
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_DEFINE(<define>, <header>)
dnl ## acconfig.h:
dnl ## #undef HAVE_<define>
@@ -619,7 +579,7 @@
dnl ##
dnl ## Check for an ANSI C typedef in a header
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_TYPEDEF(<typedef>, <header>)
dnl ## acconfig.h:
dnl ## #undef HAVE_<typedef>
@@ -644,7 +604,7 @@
dnl ##
dnl ## Check for an ANSI C struct attribute in a structure defined in a header
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_STRUCTATTR(<attr>, <struct>, <header>)
dnl ## acconfig.h:
dnl ## #undef HAVE_<attr>
@@ -672,7 +632,7 @@
dnl ##
dnl ## Check for argument type of a function
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_ARGTYPE(<header> [...], <func>, <arg-number>,
dnl ## <max-arg-number>, <action-with-${ac_type}>)
dnl ##
@@ -705,7 +665,9 @@
fi
i=`expr $i + 1`
done
+changequote([, ])dnl
(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |\
+changequote(, )dnl
sed -e ':join' \
-e '/,[ ]*$/N' \
-e 's/,[ ]*\n[ ]*/, /' \
@@ -741,62 +703,10 @@
])
dnl ##
-dnl ## Check for existance of a function
-dnl ##
-dnl ## configure.in:
-dnl ## AC_CHECK_FUNCTION(<function> [, <action-if-found> [, <action-if-not-found>]])
-dnl ## AC_CHECK_FUNCTIONS(<function> [...] [, <action-if-found> [, <action-if-not-found>]])
-dnl ##
-
-AC_DEFUN(AC_CHECK_FUNCTIONS,[dnl
-for ac_func in $1; do
- AC_CHECK_FUNCTION($ac_func,
- [changequote(, )dnl
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- changequote([, ])dnl
- AC_DEFINE_UNQUOTED($ac_tr_func) $2], $3)dnl
-done
-])
-
-AC_DEFUN(AC_CHECK_FUNCTION, [dnl
-AC_MSG_CHECKING([for function $1])
-AC_CACHE_VAL(ac_cv_func_$1, [dnl
-AC_TRY_LINK([
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $1(); below. */
-#include <assert.h>
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $1();
-char (*f)();
-], [
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$1) || defined (__stub___$1)
-choke me
-#else
-f = $1;
-#endif
-], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])
-if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
-else
- AC_MSG_RESULT(no)
-ifelse([$3], , , [$3
-])dnl
-fi
-])
-
-dnl ##
dnl ## Decision Hierachy
dnl ##
-define(AC_IFALLYES,[dnl
+m4_define(AC_IFALLYES,[dnl
ac_rc=yes
for ac_spec in $1; do
ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
@@ -831,20 +741,20 @@
fi
])
-define(AC_BEGIN_DECISION,[dnl
+m4_define(AC_BEGIN_DECISION,[dnl
ac_decision_item='$1'
ac_decision_msg='FAILED'
ac_decision=''
])
-define(AC_DECIDE,[dnl
+m4_define(AC_DECIDE,[dnl
ac_decision='$1'
ac_decision_msg='$2'
ac_decision_$1=yes
ac_decision_$1_msg='$2'
])
-define(AC_DECISION_OVERRIDE,[dnl
+m4_define(AC_DECISION_OVERRIDE,[dnl
ac_decision=''
for ac_item in $1; do
eval "ac_decision_this=\$ac_decision_${ac_item}"
@@ -855,12 +765,12 @@
done
])
-define(AC_DECISION_FORCE,[dnl
+m4_define(AC_DECISION_FORCE,[dnl
ac_decision="$1"
eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\""
])
-define(AC_END_DECISION,[dnl
+m4_define(AC_END_DECISION,[dnl
if test ".$ac_decision" = .; then
echo "[$]0:Error: decision on $ac_decision_item failed." 1>&2
echo "[$]0:Hint: see config.log for more details!" 1>&2
@@ -876,7 +786,7 @@
dnl ##
dnl ## Check for existance of a file
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_TEST_FILE(<file>, <success-action>, <failure-action>)
dnl ##
@@ -902,7 +812,7 @@
dnl ##
dnl ## Check for socket/network size type
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_SOCKLENTYPE(<action-with-${ac_type}>)
dnl ##
@@ -950,7 +860,7 @@
dnl ##
dnl ## Check for filedescriptor number type
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_NFDSTYPE(<action-with-${ac_type}>)
dnl ##
@@ -975,7 +885,7 @@
dnl ##
dnl ## Check for direction of stack growth
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_STACKGROWTH(<define>)
dnl ## acconfig.h:
dnl ## #undef <define>
@@ -1038,7 +948,7 @@
dnl ##
dnl ## Check whether and how a POSIX compliant sigsetjmp(3) can be achieved
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_SJLJ(<success-action>, <failure-action>, <type-var>)
dnl ##
@@ -1152,7 +1062,7 @@
rc=`cat conftestval`,
rc=failed,
rc=failed
-)dnl
+)
CFLAGS="$OCFLAGS"
if test ".$rc" = .ok; then
ac_cv_check_sjlj=$testtype
@@ -1204,7 +1114,7 @@
dnl ##
dnl ## Check for number of signals (NSIG)
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_NSIG(<define>)
dnl ## acconfig.h:
dnl ## #undef <define>
@@ -1248,7 +1158,7 @@
nsig=`cat conftestval`,
nsig=32,
nsig=32
-)dnl
+)
AC_MSG_RESULT([$nsig])
AC_DEFINE_UNQUOTED($1, $nsig)
])
@@ -1259,7 +1169,7 @@
dnl ## - searches under standard paths include, lib, etc.
dnl ## - searches under subareas like .libs, etc.
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_EXTLIB(<realname>, <libname>, <func>, <header>,
dnl ## [<success-action> [, <fail-action>]])
dnl ## Makefile.in:
@@ -1271,8 +1181,8 @@
dnl ##
AC_DEFUN(AC_CHECK_EXTLIB,[dnl
-AC_ARG_WITH($2,dnl
-[ --with-]substr([$2[[=DIR]] ], 0, 19)[build against $1 library (default=no)],
+AC_ARG_WITH($2,[dnl
+[ --with-]m4_substr([$2[[=DIR]] ], 0, 19)[build against $1 library (default=no)]],
if test ".$with_$2" = .yes; then
# via config script
$2_version=`($2-config --version) 2>/dev/null`
@@ -1357,7 +1267,7 @@
dnl ## Check whether SVR4/SUSv2 makecontext(2), swapcontext(2) and
dnl ## friends can be used for user-space context switching
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_MCSC(<success-action>, <failure-action>)
dnl ##
@@ -1434,7 +1344,7 @@
dnl ## Check how stacks have to be setup for the functions
dnl ## sigstack(2), sigaltstack(2) and makecontext(2).
dnl ##
-dnl ## configure.in:
+dnl ## configure.ac:
dnl ## AC_CHECK_STACKSETUP(sigstack|sigaltstack|makecontext, <macro-addr>, <macro-size>)
dnl ## acconfig.h:
dnl ## #undef HAVE_{SIGSTACK|SIGALTSTACK|MAKECONTEXT}
@@ -1458,7 +1368,7 @@
dnl # we require the C compiler and the standard headers
AC_REQUIRE([AC_HEADER_STDC])dnl
dnl # we at least require the function to check
-AC_CHECK_FUNCTIONS($1)
+AC_CHECK_FUNCS($1)
dnl # sigaltstack on some platforms uses stack_t instead of struct sigaltstack
ifelse($1, sigaltstack, [
AC_ONCE(stacksetup_stack_t, [
@@ -1619,7 +1529,7 @@
],[
dnl # cross-platform => failed
ac_cv_stacksetup_$1='guessed:(skaddr),(sksize)'
-])dnl
+])
dnl # restore original compile environment
CFLAGS="$OCFLAGS"
])dnl
@@ -1640,5 +1550,3 @@
AC_MSG_VERBOSE([$]$3)
])
-divert
-
|
