mirror of
git://git.sv.gnu.org/autoconf
synced 2025-03-31 15:00:26 +08:00
* lib/autoconf/general.m4 (AC_LIST_MEMBER_OF, AC_LINKER_OPTION):
Move to... * lib/autoconf/fortran.m4 (_AC_LIST_MEMBER_IF, _AC_LINKER_OPTION): here. * lib/autoconf/general.m4 (AC_TRY_LINK_FUNC): Move to... * lib/autoconf/functions.m4: here. * lib/autoconf/general.m4 (AC_SEARCH_LIBS, AC_CHECK_LIB) (AH_CHECK_LIB): Move to... * lib/autoconf/libs: this new file. * lib/autoconf/specific.m4 (_AC_PATH_X_XMKMF, _AC_PATH_X_DIRECT) (_AC_PATH_X, AC_PATH_X, AC_PATH_XTRA): Move to... * lib/autoconf/libs.m4: here. * lib/autoconf/autoconf.m4, lib/autoconf/Makefile.am: Adjust.
This commit is contained in:
Akim Demaille
parent
ebca389eda
commit
0ad3e59592
16
ChangeLog
16
ChangeLog
@ -1,3 +1,19 @@
|
||||
2001-08-22 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* lib/autoconf/general.m4 (AC_LIST_MEMBER_OF, AC_LINKER_OPTION):
|
||||
Move to...
|
||||
* lib/autoconf/fortran.m4 (_AC_LIST_MEMBER_IF, _AC_LINKER_OPTION):
|
||||
here.
|
||||
* lib/autoconf/general.m4 (AC_TRY_LINK_FUNC): Move to...
|
||||
* lib/autoconf/functions.m4: here.
|
||||
* lib/autoconf/general.m4 (AC_SEARCH_LIBS, AC_CHECK_LIB)
|
||||
(AH_CHECK_LIB): Move to...
|
||||
* lib/autoconf/libs: this new file.
|
||||
* lib/autoconf/specific.m4 (_AC_PATH_X_XMKMF, _AC_PATH_X_DIRECT)
|
||||
(_AC_PATH_X, AC_PATH_X, AC_PATH_XTRA): Move to...
|
||||
* lib/autoconf/libs.m4: here.
|
||||
* lib/autoconf/autoconf.m4, lib/autoconf/Makefile.am: Adjust.
|
||||
|
||||
2001-08-22 Akim Demaille <akim@epita.fr>
|
||||
|
||||
* lib/m4sugar/m4sh.m4 (AS_MKDIR_P): Fail if fails.
|
||||
|
||||
@ -21,7 +21,7 @@ distautoconflibdir = $(pkgdatadir)/autoconf
|
||||
distautoconflib_DATA = autoconf.m4 \
|
||||
general.m4 oldnames.m4 specific.m4 \
|
||||
lang.m4 c.m4 fortran.m4 \
|
||||
functions.m4 headers.m4 types.m4
|
||||
functions.m4 headers.m4 types.m4 libs.m4
|
||||
nodistautoconflibdir = $(pkgdatadir)/autoconf
|
||||
# The order matters: we need version.m4 to build autoconf.m4f.
|
||||
nodistautoconflib_DATA = version.m4 autoconf.m4f
|
||||
@ -131,7 +131,8 @@ autoconf.m4f: $(srclibdir)/m4sugar/m4sugar.m4 \
|
||||
$(srclibdir)/autoconf/fortran.m4 \
|
||||
$(srclibdir)/autoconf/functions.m4 \
|
||||
$(srclibdir)/autoconf/headers.m4 \
|
||||
$(srclibdir)/autoconf/types.m4
|
||||
$(srclibdir)/autoconf/types.m4 \
|
||||
$(srclibdir)/autoconf/libs.m4
|
||||
|
||||
# Files that should be removed, but which Automake does not know.
|
||||
CLEANFILES = autoconf.m4f
|
||||
|
||||
@ -67,7 +67,7 @@ PERL = @PERL@
|
||||
VERSION = @VERSION@
|
||||
|
||||
distautoconflibdir = $(pkgdatadir)/autoconf
|
||||
distautoconflib_DATA = autoconf.m4 general.m4 oldnames.m4 specific.m4 lang.m4 c.m4 fortran.m4 functions.m4 headers.m4 types.m4
|
||||
distautoconflib_DATA = autoconf.m4 general.m4 oldnames.m4 specific.m4 lang.m4 c.m4 fortran.m4 functions.m4 headers.m4 types.m4 libs.m4
|
||||
|
||||
nodistautoconflibdir = $(pkgdatadir)/autoconf
|
||||
# The order matters: we need version.m4 to build autoconf.m4f.
|
||||
@ -338,7 +338,8 @@ autoconf.m4f: $(srclibdir)/m4sugar/m4sugar.m4 \
|
||||
$(srclibdir)/autoconf/fortran.m4 \
|
||||
$(srclibdir)/autoconf/functions.m4 \
|
||||
$(srclibdir)/autoconf/headers.m4 \
|
||||
$(srclibdir)/autoconf/types.m4
|
||||
$(srclibdir)/autoconf/types.m4 \
|
||||
$(srclibdir)/autoconf/libs.m4
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
||||
@ -59,6 +59,7 @@ m4_include([autoconf/fortran.m4])
|
||||
m4_include([autoconf/functions.m4])
|
||||
m4_include([autoconf/headers.m4])
|
||||
m4_include([autoconf/types.m4])
|
||||
m4_include([autoconf/libs.m4])
|
||||
m4_include([autoconf/specific.m4])
|
||||
m4_include([autoconf/oldnames.m4])
|
||||
|
||||
|
||||
@ -50,6 +50,70 @@
|
||||
# Roland McGrath, Noah Friedman, david d zuhn, and many others.
|
||||
|
||||
|
||||
# _AC_LIST_MEMBER_IF(ELEMENT, LIST, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
# ---------------------------------------------------------------------------
|
||||
#
|
||||
# Processing the elements of a list is tedious in shell programming,
|
||||
# as lists tend to be implemented as space delimited strings.
|
||||
#
|
||||
# This macro searches LIST for ELEMENT, and executes ACTION-IF-FOUND
|
||||
# if ELEMENT is a member of LIST, otherwise it executes
|
||||
# ACTION-IF-NOT-FOUND.
|
||||
AC_DEFUN([_AC_LIST_MEMBER_IF],
|
||||
[dnl Do some sanity checking of the arguments.
|
||||
m4_if([$1], , [AC_FATAL([$0: missing argument 1])])dnl
|
||||
m4_if([$2], , [AC_FATAL([$0: missing argument 2])])dnl
|
||||
ac_exists=false
|
||||
for ac_i in $2; do
|
||||
if test x"$1" = x"$ac_i"; then
|
||||
ac_exists=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
AS_IF([test x"$ac_exists" = xtrue], [$3], [$4])[]dnl
|
||||
])# _AC_LIST_MEMBER_IF
|
||||
|
||||
|
||||
# _AC_LINKER_OPTION(LINKER-OPTIONS, SHELL-VARIABLE)
|
||||
# -------------------------------------------------
|
||||
#
|
||||
# Specifying options to the compiler (whether it be the C, C++ or
|
||||
# Fortran 77 compiler) that are meant for the linker is compiler
|
||||
# dependent. This macro lets you give options to the compiler that
|
||||
# are meant for the linker in a portable, compiler-independent way.
|
||||
#
|
||||
# This macro take two arguments, a list of linker options that the
|
||||
# compiler should pass to the linker (LINKER-OPTIONS) and the name of
|
||||
# a shell variable (SHELL-VARIABLE). The list of linker options are
|
||||
# appended to the shell variable in a compiler-dependent way.
|
||||
#
|
||||
# For example, if the selected language is C, then this:
|
||||
#
|
||||
# _AC_LINKER_OPTION([-R /usr/local/lib/foo], foo_LDFLAGS)
|
||||
#
|
||||
# will expand into this if the selected C compiler is gcc:
|
||||
#
|
||||
# foo_LDFLAGS="-Xlinker -R -Xlinker /usr/local/lib/foo"
|
||||
#
|
||||
# otherwise, it will expand into this:
|
||||
#
|
||||
# foo_LDFLAGS"-R /usr/local/lib/foo"
|
||||
#
|
||||
# You are encouraged to add support for compilers that this macro
|
||||
# doesn't currently support.
|
||||
# FIXME: Get rid of this macro.
|
||||
AC_DEFUN([_AC_LINKER_OPTION],
|
||||
[if test "$ac_compiler_gnu" = yes; then
|
||||
for ac_link_opt in $1; do
|
||||
$2="[$]$2 -Xlinker $ac_link_opt"
|
||||
done
|
||||
else
|
||||
$2="[$]$2 $1"
|
||||
fi[]dnl
|
||||
])# _AC_LINKER_OPTION
|
||||
|
||||
|
||||
|
||||
## ----------------------- ##
|
||||
## 1. Language selection. ##
|
||||
@ -409,12 +473,12 @@ while test $[@%:@] != 1; do
|
||||
ac_arg=$[1]
|
||||
case $ac_arg in
|
||||
[[\\/]]*.a | ?:[[\\/]]*.a)
|
||||
AC_LIST_MEMBER_OF($ac_arg, $ac_cv_flibs, ,
|
||||
_AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, ,
|
||||
ac_cv_flibs="$ac_cv_flibs $ac_arg")
|
||||
;;
|
||||
-bI:*)
|
||||
AC_LIST_MEMBER_OF($ac_arg, $ac_cv_flibs, ,
|
||||
[AC_LINKER_OPTION([$ac_arg], ac_cv_flibs)])
|
||||
_AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, ,
|
||||
[_AC_LINKER_OPTION([$ac_arg], ac_cv_flibs)])
|
||||
;;
|
||||
# Ignore these flags.
|
||||
-lang* | -lcrt0.o | -lc | -lgcc | -libmil | -LANG:=*)
|
||||
@ -437,14 +501,14 @@ while test $[@%:@] != 1; do
|
||||
;;
|
||||
-YP,*)
|
||||
for ac_j in `echo $ac_arg | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
|
||||
AC_LIST_MEMBER_OF($ac_j, $ac_cv_flibs, ,
|
||||
[ac_arg="$ac_arg $ac_j"
|
||||
ac_cv_flibs="$ac_cv_flibs $ac_j"])
|
||||
_AC_LIST_MEMBER_IF($ac_j, $ac_cv_flibs, ,
|
||||
[ac_arg="$ac_arg $ac_j"
|
||||
ac_cv_flibs="$ac_cv_flibs $ac_j"])
|
||||
done
|
||||
;;
|
||||
-[[lLR]]*)
|
||||
AC_LIST_MEMBER_OF($ac_arg, $ac_cv_flibs, ,
|
||||
ac_cv_flibs="$ac_cv_flibs $ac_arg")
|
||||
_AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, ,
|
||||
ac_cv_flibs="$ac_cv_flibs $ac_arg")
|
||||
;;
|
||||
# Ignore everything else.
|
||||
esac
|
||||
@ -460,7 +524,7 @@ case `(uname -sr) 2>/dev/null` in
|
||||
ac_ld_run_path=`echo $ac_f77_v_output |
|
||||
sed -n 's,^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$,-R\1,p'`
|
||||
test "x$ac_ld_run_path" != x &&
|
||||
AC_LINKER_OPTION([$ac_ld_run_path], ac_cv_flibs)
|
||||
_AC_LINKER_OPTION([$ac_ld_run_path], ac_cv_flibs)
|
||||
;;
|
||||
esac
|
||||
fi # test "x$FLIBS" = "x"
|
||||
|
||||
@ -97,6 +97,15 @@ AC_CHECK_FUNCS([$1], , [_AC_LIBOBJ($ac_func)])
|
||||
])
|
||||
|
||||
|
||||
# AC_TRY_LINK_FUNC(FUNC, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
|
||||
# ------------------------------------------------------------
|
||||
# Try to link a program that calls FUNC, handling GCC builtins. If
|
||||
# the link succeeds, execute ACTION-IF-FOUND; otherwise, execute
|
||||
# ACTION-IF-NOT-FOUND.
|
||||
AC_DEFUN([AC_TRY_LINK_FUNC],
|
||||
[AC_LINK_IFELSE([AC_LANG_CALL([], [$1])], [$2], [$3])])
|
||||
|
||||
|
||||
# AU::AC_FUNC_CHECK
|
||||
# -----------------
|
||||
AU_ALIAS([AC_FUNC_CHECK], [AC_CHECK_FUNC])
|
||||
|
||||
@ -2509,121 +2509,6 @@ m4_popdef([AC_Prog])dnl
|
||||
|
||||
|
||||
|
||||
## ------------------------ ##
|
||||
## Checking for libraries. ##
|
||||
## ------------------------ ##
|
||||
|
||||
|
||||
# AC_TRY_LINK_FUNC(FUNC, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
|
||||
# ------------------------------------------------------------
|
||||
# Try to link a program that calls FUNC, handling GCC builtins. If
|
||||
# the link succeeds, execute ACTION-IF-FOUND; otherwise, execute
|
||||
# ACTION-IF-NOT-FOUND.
|
||||
AC_DEFUN([AC_TRY_LINK_FUNC],
|
||||
[AC_LINK_IFELSE([AC_LANG_CALL([], [$1])], [$2], [$3])])
|
||||
|
||||
|
||||
# AC_SEARCH_LIBS(FUNCTION, SEARCH-LIBS,
|
||||
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
|
||||
# [OTHER-LIBRARIES])
|
||||
# --------------------------------------------------------
|
||||
# Search for a library defining FUNC, if it's not already available.
|
||||
AC_DEFUN([AC_SEARCH_LIBS],
|
||||
[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
|
||||
[ac_func_search_save_LIBS=$LIBS
|
||||
ac_cv_search_$1=no
|
||||
AC_TRY_LINK_FUNC([$1], [ac_cv_search_$1="none required"])
|
||||
if test "$ac_cv_search_$1" = no; then
|
||||
for ac_lib in $2; do
|
||||
LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
|
||||
AC_TRY_LINK_FUNC([$1],
|
||||
[ac_cv_search_$1="-l$ac_lib"
|
||||
break])
|
||||
done
|
||||
fi
|
||||
LIBS=$ac_func_search_save_LIBS])
|
||||
AS_IF([test "$ac_cv_search_$1" != no],
|
||||
[test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
|
||||
$3],
|
||||
[$4])dnl
|
||||
])
|
||||
|
||||
|
||||
|
||||
# AC_CHECK_LIB(LIBRARY, FUNCTION,
|
||||
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
|
||||
# [OTHER-LIBRARIES])
|
||||
# ------------------------------------------------------
|
||||
#
|
||||
# Use a cache variable name containing both the library and function name,
|
||||
# because the test really is for library $1 defining function $2, not
|
||||
# just for library $1. Separate tests with the same $1 and different $2s
|
||||
# may have different results.
|
||||
#
|
||||
# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])
|
||||
# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give
|
||||
# ac_cv_lib_$lib_fun, which is definitely not what was meant. Hence
|
||||
# the AS_LITERAL_IF indirection.
|
||||
#
|
||||
# FIXME: This macro is extremely suspicious. It DEFINEs unconditionnally,
|
||||
# whatever the FUNCTION, in addition to not being a *S macro. Note
|
||||
# that the cache does depend upon the function we are looking for.
|
||||
#
|
||||
# It is on purpose we used `ac_check_lib_save_LIBS' and not just
|
||||
# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
|
||||
# changed but still want to use AC_CHECK_LIB, so they save `LIBS'.
|
||||
# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
|
||||
# freedom.
|
||||
AC_DEFUN([AC_CHECK_LIB],
|
||||
[m4_ifval([$3], , [AH_CHECK_LIB([$1])])dnl
|
||||
AS_LITERAL_IF([$1],
|
||||
[AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])],
|
||||
[AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl
|
||||
AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
|
||||
[ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-l$1 $5 $LIBS"
|
||||
AC_TRY_LINK_FUNC([$2],
|
||||
[AS_VAR_SET(ac_Lib, yes)],
|
||||
[AS_VAR_SET(ac_Lib, no)])
|
||||
LIBS=$ac_check_lib_save_LIBS])
|
||||
AS_IF([test AS_VAR_GET(ac_Lib) = yes],
|
||||
[m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
|
||||
LIBS="-l$1 $LIBS"
|
||||
])],
|
||||
[$4])dnl
|
||||
AS_VAR_POPDEF([ac_Lib])dnl
|
||||
])# AC_CHECK_LIB
|
||||
|
||||
|
||||
# AH_CHECK_LIB(LIBNAME)
|
||||
# ---------------------
|
||||
m4_define([AH_CHECK_LIB],
|
||||
[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
|
||||
[Define if you have the `]$1[' library (-l]$1[).])])
|
||||
|
||||
|
||||
# AC_HAVE_LIBRARY(LIBRARY,
|
||||
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
|
||||
# [OTHER-LIBRARIES])
|
||||
# ---------------------------------------------------------
|
||||
#
|
||||
# This macro is equivalent to calling `AC_CHECK_LIB' with a FUNCTION
|
||||
# argument of `main'. In addition, LIBRARY can be written as any of
|
||||
# `foo', `-lfoo', or `libfoo.a'. In all of those cases, the compiler
|
||||
# is passed `-lfoo'. However, LIBRARY cannot be a shell variable;
|
||||
# it must be a literal name.
|
||||
AU_DEFUN([AC_HAVE_LIBRARY],
|
||||
[m4_pushdef([AC_Lib_Name],
|
||||
m4_patsubst(m4_patsubst([[$1]],
|
||||
[lib\([^\.]*\)\.a], [\1]),
|
||||
[-l], []))dnl
|
||||
AC_CHECK_LIB(AC_Lib_Name, main, [$2], [$3], [$4])dnl
|
||||
ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main
|
||||
m4_popdef([AC_Lib_Name])dnl
|
||||
])
|
||||
|
||||
|
||||
|
||||
## ------------------------ ##
|
||||
## Examining declarations. ##
|
||||
## ------------------------ ##
|
||||
@ -4455,67 +4340,3 @@ if test "$no_recursion" != yes; then
|
||||
done
|
||||
fi
|
||||
])# _AC_OUTPUT_SUBDIRS
|
||||
|
||||
|
||||
# AC_LINKER_OPTION(LINKER-OPTIONS, SHELL-VARIABLE)
|
||||
# ------------------------------------------------
|
||||
#
|
||||
# Specifying options to the compiler (whether it be the C, C++ or
|
||||
# Fortran 77 compiler) that are meant for the linker is compiler
|
||||
# dependent. This macro lets you give options to the compiler that
|
||||
# are meant for the linker in a portable, compiler-independent way.
|
||||
#
|
||||
# This macro take two arguments, a list of linker options that the
|
||||
# compiler should pass to the linker (LINKER-OPTIONS) and the name of
|
||||
# a shell variable (SHELL-VARIABLE). The list of linker options are
|
||||
# appended to the shell variable in a compiler-dependent way.
|
||||
#
|
||||
# For example, if the selected language is C, then this:
|
||||
#
|
||||
# AC_LINKER_OPTION([-R /usr/local/lib/foo], foo_LDFLAGS)
|
||||
#
|
||||
# will expand into this if the selected C compiler is gcc:
|
||||
#
|
||||
# foo_LDFLAGS="-Xlinker -R -Xlinker /usr/local/lib/foo"
|
||||
#
|
||||
# otherwise, it will expand into this:
|
||||
#
|
||||
# foo_LDFLAGS"-R /usr/local/lib/foo"
|
||||
#
|
||||
# You are encouraged to add support for compilers that this macro
|
||||
# doesn't currently support.
|
||||
# FIXME: Get rid of this macro.
|
||||
AC_DEFUN([AC_LINKER_OPTION],
|
||||
[if test "$ac_compiler_gnu" = yes; then
|
||||
for ac_link_opt in $1; do
|
||||
$2="[$]$2 -Xlinker $ac_link_opt"
|
||||
done
|
||||
else
|
||||
$2="[$]$2 $1"
|
||||
fi])
|
||||
|
||||
|
||||
# AC_LIST_MEMBER_OF(ELEMENT, LIST, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
# --------------------------------------------------------------------------
|
||||
#
|
||||
# Processing the elements of a list is tedious in shell programming,
|
||||
# as lists tend to be implemented as space delimited strings.
|
||||
#
|
||||
# This macro searches LIST for ELEMENT, and executes ACTION-IF-FOUND
|
||||
# if ELEMENT is a member of LIST, otherwise it executes
|
||||
# ACTION-IF-NOT-FOUND.
|
||||
AC_DEFUN([AC_LIST_MEMBER_OF],
|
||||
[dnl Do some sanity checking of the arguments.
|
||||
m4_if([$1], , [AC_FATAL([$0]: missing argument 1)])dnl
|
||||
m4_if([$2], , [AC_FATAL([$0]: missing argument 2)])dnl
|
||||
|
||||
ac_exists=false
|
||||
for ac_i in $2; do
|
||||
if test x"$1" = x"$ac_i"; then
|
||||
ac_exists=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
AS_IF([test x"$ac_exists" = xtrue], [$3], [$4])[]dnl
|
||||
])
|
||||
|
||||
@ -569,323 +569,6 @@ AC_DEFUN([AC_SYS_POSIX_TERMIOS],
|
||||
|
||||
|
||||
|
||||
## --------------------- ##
|
||||
## Checks for X window. ##
|
||||
## --------------------- ##
|
||||
|
||||
|
||||
# _AC_PATH_X_XMKMF
|
||||
# ----------------
|
||||
# Internal subroutine of _AC_PATH_X.
|
||||
# Set ac_x_includes and/or ac_x_libraries.
|
||||
m4_define([_AC_PATH_X_XMKMF],
|
||||
[rm -fr conftest.dir
|
||||
if mkdir conftest.dir; then
|
||||
cd conftest.dir
|
||||
# Make sure to not put "make" in the Imakefile rules, since we grep it out.
|
||||
cat >Imakefile <<'_ACEOF'
|
||||
acfindx:
|
||||
@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
|
||||
_ACEOF
|
||||
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
|
||||
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
||||
eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
|
||||
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
|
||||
for ac_extension in a so sl; do
|
||||
if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
|
||||
test -f $ac_im_libdir/libX11.$ac_extension; then
|
||||
ac_im_usrlibdir=$ac_im_libdir; break
|
||||
fi
|
||||
done
|
||||
# Screen out bogus values from the imake configuration. They are
|
||||
# bogus both because they are the default anyway, and because
|
||||
# using them would break gcc on systems where it needs fixed includes.
|
||||
case $ac_im_incroot in
|
||||
/usr/include) ;;
|
||||
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
|
||||
esac
|
||||
case $ac_im_usrlibdir in
|
||||
/usr/lib | /lib) ;;
|
||||
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
|
||||
esac
|
||||
fi
|
||||
cd ..
|
||||
rm -fr conftest.dir
|
||||
fi
|
||||
])# _AC_PATH_X_XMKMF
|
||||
|
||||
|
||||
# _AC_PATH_X_DIRECT
|
||||
# -----------------
|
||||
# Internal subroutine of _AC_PATH_X.
|
||||
# Set ac_x_includes and/or ac_x_libraries.
|
||||
m4_define([_AC_PATH_X_DIRECT],
|
||||
[# Standard set of common directories for X headers.
|
||||
# Check X11 before X11Rn because it is often a symlink to the current release.
|
||||
ac_x_header_dirs='
|
||||
/usr/X11/include
|
||||
/usr/X11R6/include
|
||||
/usr/X11R5/include
|
||||
/usr/X11R4/include
|
||||
|
||||
/usr/include/X11
|
||||
/usr/include/X11R6
|
||||
/usr/include/X11R5
|
||||
/usr/include/X11R4
|
||||
|
||||
/usr/local/X11/include
|
||||
/usr/local/X11R6/include
|
||||
/usr/local/X11R5/include
|
||||
/usr/local/X11R4/include
|
||||
|
||||
/usr/local/include/X11
|
||||
/usr/local/include/X11R6
|
||||
/usr/local/include/X11R5
|
||||
/usr/local/include/X11R4
|
||||
|
||||
/usr/X386/include
|
||||
/usr/x386/include
|
||||
/usr/XFree86/include/X11
|
||||
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/usr/unsupported/include
|
||||
/usr/athena/include
|
||||
/usr/local/x11r5/include
|
||||
/usr/lpp/Xamples/include
|
||||
|
||||
/usr/openwin/include
|
||||
/usr/openwin/share/include'
|
||||
|
||||
if test "$ac_x_includes" = no; then
|
||||
# Guess where to find include files, by looking for Intrinsic.h.
|
||||
# First, try using that file with no special directory specified.
|
||||
AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
|
||||
[# We can compile using X headers with no special include directory.
|
||||
ac_x_includes=],
|
||||
[for ac_dir in $ac_x_header_dirs; do
|
||||
if test -r "$ac_dir/X11/Intrinsic.h"; then
|
||||
ac_x_includes=$ac_dir
|
||||
break
|
||||
fi
|
||||
done])
|
||||
fi # $ac_x_includes = no
|
||||
|
||||
if test "$ac_x_libraries" = no; then
|
||||
# Check for the libraries.
|
||||
# See if we find them without any special options.
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="-lXt $LIBS"
|
||||
AC_TRY_LINK([@%:@include <X11/Intrinsic.h>], [XtMalloc (0)],
|
||||
[LIBS=$ac_save_LIBS
|
||||
# We can link X programs with no special library path.
|
||||
ac_x_libraries=],
|
||||
[LIBS=$ac_save_LIBS
|
||||
for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
||||
do
|
||||
# Don't even attempt the hair of trying to link an X program!
|
||||
for ac_extension in a so sl; do
|
||||
if test -r $ac_dir/libXt.$ac_extension; then
|
||||
ac_x_libraries=$ac_dir
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done])
|
||||
fi # $ac_x_libraries = no
|
||||
])# _AC_PATH_X_DIRECT
|
||||
|
||||
|
||||
# _AC_PATH_X
|
||||
# ----------
|
||||
# Compute ac_cv_have_x.
|
||||
AC_DEFUN([_AC_PATH_X],
|
||||
[AC_CACHE_VAL(ac_cv_have_x,
|
||||
[# One or both of the vars are not set, and there is no cached value.
|
||||
ac_x_includes=no ac_x_libraries=no
|
||||
_AC_PATH_X_XMKMF
|
||||
_AC_PATH_X_DIRECT
|
||||
if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
|
||||
# Didn't find X anywhere. Cache the known absence of X.
|
||||
ac_cv_have_x="have_x=no"
|
||||
else
|
||||
# Record where we found X for the cache.
|
||||
ac_cv_have_x="have_x=yes \
|
||||
ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
|
||||
fi])dnl
|
||||
])
|
||||
|
||||
|
||||
# AC_PATH_X
|
||||
# ---------
|
||||
# If we find X, set shell vars x_includes and x_libraries to the
|
||||
# paths, otherwise set no_x=yes.
|
||||
# Uses ac_ vars as temps to allow command line to override cache and checks.
|
||||
# --without-x overrides everything else, but does not touch the cache.
|
||||
AC_DEFUN([AC_PATH_X],
|
||||
[dnl Document the X abnormal options inherited from history.
|
||||
m4_divert_once([HELP_BEGIN], [
|
||||
X features:
|
||||
--x-includes=DIR X include files are in DIR
|
||||
--x-libraries=DIR X library files are in DIR])dnl
|
||||
AC_MSG_CHECKING([for X])
|
||||
|
||||
AC_ARG_WITH(x, [ --with-x use the X Window System])
|
||||
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
|
||||
if test "x$with_x" = xno; then
|
||||
# The user explicitly disabled X.
|
||||
have_x=disabled
|
||||
else
|
||||
if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
|
||||
# Both variables are already set.
|
||||
have_x=yes
|
||||
else
|
||||
_AC_PATH_X
|
||||
fi
|
||||
eval "$ac_cv_have_x"
|
||||
fi # $with_x != no
|
||||
|
||||
if test "$have_x" != yes; then
|
||||
AC_MSG_RESULT([$have_x])
|
||||
no_x=yes
|
||||
else
|
||||
# If each of the values was on the command line, it overrides each guess.
|
||||
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
|
||||
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
|
||||
# Update the cache value to reflect the command line values.
|
||||
ac_cv_have_x="have_x=yes \
|
||||
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
|
||||
AC_MSG_RESULT([libraries $x_libraries, headers $x_includes])
|
||||
fi
|
||||
])# AC_PATH_X
|
||||
|
||||
|
||||
|
||||
# AC_PATH_XTRA
|
||||
# ------------
|
||||
# Find additional X libraries, magic flags, etc.
|
||||
AC_DEFUN([AC_PATH_XTRA],
|
||||
[AC_REQUIRE([AC_PATH_X])dnl
|
||||
if test "$no_x" = yes; then
|
||||
# Not all programs may use this symbol, but it does not hurt to define it.
|
||||
AC_DEFINE([X_DISPLAY_MISSING], 1,
|
||||
[Define if the X Window System is missing or not being used.])
|
||||
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
|
||||
else
|
||||
if test -n "$x_includes"; then
|
||||
X_CFLAGS="$X_CFLAGS -I$x_includes"
|
||||
fi
|
||||
|
||||
# It would also be nice to do this for all -L options, not just this one.
|
||||
if test -n "$x_libraries"; then
|
||||
X_LIBS="$X_LIBS -L$x_libraries"
|
||||
dnl FIXME: banish uname from this macro!
|
||||
# For Solaris; some versions of Sun CC require a space after -R and
|
||||
# others require no space. Words are not sufficient . . . .
|
||||
case `(uname -sr) 2>/dev/null` in
|
||||
"SunOS 5"*)
|
||||
AC_MSG_CHECKING([whether -R must be followed by a space])
|
||||
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_nospace=yes, ac_R_nospace=no)
|
||||
if test $ac_R_nospace = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
X_LIBS="$X_LIBS -R$x_libraries"
|
||||
else
|
||||
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_space=yes, ac_R_space=no)
|
||||
if test $ac_R_space = yes; then
|
||||
AC_MSG_RESULT([yes])
|
||||
X_LIBS="$X_LIBS -R $x_libraries"
|
||||
else
|
||||
AC_MSG_RESULT([neither works])
|
||||
fi
|
||||
fi
|
||||
LIBS=$ac_xsave_LIBS
|
||||
esac
|
||||
fi
|
||||
|
||||
# Check for system-dependent libraries X programs must link with.
|
||||
# Do this before checking for the system-independent R6 libraries
|
||||
# (-lICE), since we may need -lsocket or whatever for X linking.
|
||||
|
||||
if test "$ISC" = yes; then
|
||||
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
|
||||
else
|
||||
# Martyn Johnson says this is needed for Ultrix, if the X
|
||||
# libraries were built with DECnet support. And Karl Berry says
|
||||
# the Alpha needs dnet_stub (dnet does not exist).
|
||||
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
|
||||
AC_TRY_LINK_FUNC(XOpenDisplay, ,
|
||||
[AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
|
||||
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
|
||||
AC_CHECK_LIB(dnet_stub, dnet_ntoa,
|
||||
[X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
|
||||
fi])
|
||||
LIBS="$ac_xsave_LIBS"
|
||||
|
||||
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
|
||||
# to get the SysV transport functions.
|
||||
# Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
|
||||
# needs -lnsl.
|
||||
# The nsl library prevents programs from opening the X display
|
||||
# on Irix 5.2, according to T.E. Dickey.
|
||||
# The functions gethostbyname, getservbyname, and inet_addr are
|
||||
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
|
||||
AC_CHECK_FUNC(gethostbyname)
|
||||
if test $ac_cv_func_gethostbyname = no; then
|
||||
AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
|
||||
if test $ac_cv_lib_nsl_gethostbyname = no; then
|
||||
AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd")
|
||||
fi
|
||||
fi
|
||||
|
||||
# lieder@skyler.mavd.honeywell.com says without -lsocket,
|
||||
# socket/setsockopt and other routines are undefined under SCO ODT
|
||||
# 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
|
||||
# on later versions), says Simon Leinen: it contains gethostby*
|
||||
# variants that don't use the nameserver (or something). -lsocket
|
||||
# must be given before -lnsl if both are needed. We assume that
|
||||
# if connect needs -lnsl, so does gethostbyname.
|
||||
AC_CHECK_FUNC(connect)
|
||||
if test $ac_cv_func_connect = no; then
|
||||
AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
|
||||
$X_EXTRA_LIBS)
|
||||
fi
|
||||
|
||||
# Guillermo Gomez says -lposix is necessary on A/UX.
|
||||
AC_CHECK_FUNC(remove)
|
||||
if test $ac_cv_func_remove = no; then
|
||||
AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
|
||||
fi
|
||||
|
||||
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
||||
AC_CHECK_FUNC(shmat)
|
||||
if test $ac_cv_func_shmat = no; then
|
||||
AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc")
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check for libraries that X11R6 Xt/Xaw programs need.
|
||||
ac_save_LDFLAGS=$LDFLAGS
|
||||
test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
|
||||
# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
|
||||
# check for ICE first), but we must link in the order -lSM -lICE or
|
||||
# we get undefined symbols. So assume we have SM if we have ICE.
|
||||
# These have to be linked with before -lX11, unlike the other
|
||||
# libraries we check for below, so use a different variable.
|
||||
# John Interrante, Karl Berry
|
||||
AC_CHECK_LIB(ICE, IceConnectionNumber,
|
||||
[X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], , $X_EXTRA_LIBS)
|
||||
LDFLAGS=$ac_save_LDFLAGS
|
||||
|
||||
fi
|
||||
AC_SUBST(X_CFLAGS)dnl
|
||||
AC_SUBST(X_PRE_LIBS)dnl
|
||||
AC_SUBST(X_LIBS)dnl
|
||||
AC_SUBST(X_EXTRA_LIBS)dnl
|
||||
])# AC_PATH_XTRA
|
||||
|
||||
|
||||
|
||||
## ------------------------------------ ##
|
||||
## Checks for not-quite-Unix variants. ##
|
||||
|
||||
@ -20,13 +20,17 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
SUITE_GENERATED = \
|
||||
aclang.at acc.at acfortran.at \
|
||||
acgeneral.at acspecific.at acfunctions.at acheaders.at actypes.at \
|
||||
aclibs.at
|
||||
|
||||
SUITE = suite.at \
|
||||
m4sugar.at m4sh.at \
|
||||
base.at tools.at torture.at \
|
||||
compile.at \
|
||||
aclang.at acc.at acfortran.at \
|
||||
$(SUITE_GENERATED) \
|
||||
semantics.at \
|
||||
acgeneral.at acspecific.at acfunctions.at acheaders.at actypes.at \
|
||||
foreign.at
|
||||
|
||||
# We don't actually distribute the testsuite, since one only
|
||||
@ -62,30 +66,10 @@ MACRO_FILES = $(top_srcdir)/lib/autoconf/general.m4 \
|
||||
$(top_srcdir)/lib/autoconf/c.m4 \
|
||||
$(top_srcdir)/lib/autoconf/fortran.m4 \
|
||||
$(top_srcdir)/lib/autoconf/headers.m4 \
|
||||
$(top_srcdir)/lib/autoconf/libs.m4 \
|
||||
$(top_srcdir)/lib/autoconf/types.m4
|
||||
|
||||
acgeneral.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acspecific.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acfunctions.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
aclang.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acc.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acfortran.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acheaders.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
actypes.at: mktests.sh $(MACRO_FILES)
|
||||
$(SUITE_GENERATED): mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
CLEANFILES = \
|
||||
|
||||
@ -68,7 +68,10 @@ VERSION = @VERSION@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
SUITE = suite.at m4sugar.at m4sh.at base.at tools.at torture.at compile.at aclang.at acc.at acfortran.at semantics.at acgeneral.at acspecific.at acfunctions.at acheaders.at actypes.at foreign.at
|
||||
SUITE_GENERATED = aclang.at acc.at acfortran.at acgeneral.at acspecific.at acfunctions.at acheaders.at actypes.at aclibs.at
|
||||
|
||||
|
||||
SUITE = suite.at m4sugar.at m4sh.at base.at tools.at torture.at compile.at $(SUITE_GENERATED) semantics.at foreign.at
|
||||
|
||||
|
||||
# We don't actually distribute the testsuite, since one only
|
||||
@ -82,7 +85,7 @@ AUTOM4TE = autom4te_perllibdir='$(top_srcdir)/lib' ../bin/autom4te
|
||||
# The files which contains macro we check for syntax. Don't use $(top_srcdir)
|
||||
# here since below we explicitly `cd' to $srcdir. As for the dependencies,
|
||||
# thanks God for VPATH. Hm...
|
||||
MACRO_FILES = $(top_srcdir)/lib/autoconf/general.m4 $(top_srcdir)/lib/autoconf/specific.m4 $(top_srcdir)/lib/autoconf/functions.m4 $(top_srcdir)/lib/autoconf/lang.m4 $(top_srcdir)/lib/autoconf/c.m4 $(top_srcdir)/lib/autoconf/fortran.m4 $(top_srcdir)/lib/autoconf/headers.m4 $(top_srcdir)/lib/autoconf/types.m4
|
||||
MACRO_FILES = $(top_srcdir)/lib/autoconf/general.m4 $(top_srcdir)/lib/autoconf/specific.m4 $(top_srcdir)/lib/autoconf/functions.m4 $(top_srcdir)/lib/autoconf/lang.m4 $(top_srcdir)/lib/autoconf/c.m4 $(top_srcdir)/lib/autoconf/fortran.m4 $(top_srcdir)/lib/autoconf/headers.m4 $(top_srcdir)/lib/autoconf/libs.m4 $(top_srcdir)/lib/autoconf/types.m4
|
||||
|
||||
|
||||
CLEANFILES = debug-*.sh state-* at-* stderr stdout script.s4g script.as script configure configure.in configure.ac config.status config.cache config.log config.h.in config.hin config.h config.guess config.sub install-sh expr libtool ltconfig ltmain.sh
|
||||
@ -208,28 +211,7 @@ testsuite: $(top_srcdir)/lib/m4sugar/m4sugar.m4 \
|
||||
chmod +x $@.tmp
|
||||
mv $@.tmp $@
|
||||
|
||||
acgeneral.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acspecific.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acfunctions.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
aclang.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acc.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acfortran.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
acheaders.at: mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
actypes.at: mktests.sh $(MACRO_FILES)
|
||||
$(SUITE_GENERATED): mktests.sh $(MACRO_FILES)
|
||||
cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
|
||||
|
||||
maintainer-check: maintainer-check-posix maintainer-check-c++
|
||||
|
||||
@ -70,6 +70,7 @@ m4_include([acspecific.at])
|
||||
m4_include([acheaders.at])
|
||||
m4_include([actypes.at])
|
||||
m4_include([acfunctions.at])
|
||||
m4_include([aclibs.at])
|
||||
|
||||
# Compatibility with foreign tools.
|
||||
m4_include([foreign.at])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user