mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-27 14:36:16 +01:00
acinclude.m4 config.guess config.sub ltconfig upgrade to libtool 1.2f
* acinclude.m4 * config.guess * config.sub * ltconfig * ltmain.sh: upgrade to libtool 1.2f * autogen.sh: libtool is not required to autogen glib * acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly needed) -Yosh
This commit is contained in:
parent
5bf6ee6baf
commit
79986f1e8b
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
|||||||
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* acinclude.m4
|
||||||
|
* config.guess
|
||||||
|
* config.sub
|
||||||
|
* ltconfig
|
||||||
|
* ltmain.sh: upgrade to libtool 1.2f
|
||||||
|
|
||||||
|
* autogen.sh: libtool is not required to autogen glib
|
||||||
|
|
||||||
|
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
|
||||||
|
needed)
|
||||||
|
|
||||||
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
||||||
|
|
||||||
* glib.def: Add new g_list, g_stack, g_queue functions.
|
* glib.def: Add new g_list, g_stack, g_queue functions.
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* acinclude.m4
|
||||||
|
* config.guess
|
||||||
|
* config.sub
|
||||||
|
* ltconfig
|
||||||
|
* ltmain.sh: upgrade to libtool 1.2f
|
||||||
|
|
||||||
|
* autogen.sh: libtool is not required to autogen glib
|
||||||
|
|
||||||
|
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
|
||||||
|
needed)
|
||||||
|
|
||||||
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
||||||
|
|
||||||
* glib.def: Add new g_list, g_stack, g_queue functions.
|
* glib.def: Add new g_list, g_stack, g_queue functions.
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* acinclude.m4
|
||||||
|
* config.guess
|
||||||
|
* config.sub
|
||||||
|
* ltconfig
|
||||||
|
* ltmain.sh: upgrade to libtool 1.2f
|
||||||
|
|
||||||
|
* autogen.sh: libtool is not required to autogen glib
|
||||||
|
|
||||||
|
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
|
||||||
|
needed)
|
||||||
|
|
||||||
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
||||||
|
|
||||||
* glib.def: Add new g_list, g_stack, g_queue functions.
|
* glib.def: Add new g_list, g_stack, g_queue functions.
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* acinclude.m4
|
||||||
|
* config.guess
|
||||||
|
* config.sub
|
||||||
|
* ltconfig
|
||||||
|
* ltmain.sh: upgrade to libtool 1.2f
|
||||||
|
|
||||||
|
* autogen.sh: libtool is not required to autogen glib
|
||||||
|
|
||||||
|
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
|
||||||
|
needed)
|
||||||
|
|
||||||
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
||||||
|
|
||||||
* glib.def: Add new g_list, g_stack, g_queue functions.
|
* glib.def: Add new g_list, g_stack, g_queue functions.
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* acinclude.m4
|
||||||
|
* config.guess
|
||||||
|
* config.sub
|
||||||
|
* ltconfig
|
||||||
|
* ltmain.sh: upgrade to libtool 1.2f
|
||||||
|
|
||||||
|
* autogen.sh: libtool is not required to autogen glib
|
||||||
|
|
||||||
|
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
|
||||||
|
needed)
|
||||||
|
|
||||||
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
||||||
|
|
||||||
* glib.def: Add new g_list, g_stack, g_queue functions.
|
* glib.def: Add new g_list, g_stack, g_queue functions.
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* acinclude.m4
|
||||||
|
* config.guess
|
||||||
|
* config.sub
|
||||||
|
* ltconfig
|
||||||
|
* ltmain.sh: upgrade to libtool 1.2f
|
||||||
|
|
||||||
|
* autogen.sh: libtool is not required to autogen glib
|
||||||
|
|
||||||
|
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
|
||||||
|
needed)
|
||||||
|
|
||||||
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
||||||
|
|
||||||
* glib.def: Add new g_list, g_stack, g_queue functions.
|
* glib.def: Add new g_list, g_stack, g_queue functions.
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* acinclude.m4
|
||||||
|
* config.guess
|
||||||
|
* config.sub
|
||||||
|
* ltconfig
|
||||||
|
* ltmain.sh: upgrade to libtool 1.2f
|
||||||
|
|
||||||
|
* autogen.sh: libtool is not required to autogen glib
|
||||||
|
|
||||||
|
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
|
||||||
|
needed)
|
||||||
|
|
||||||
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
||||||
|
|
||||||
* glib.def: Add new g_list, g_stack, g_queue functions.
|
* glib.def: Add new g_list, g_stack, g_queue functions.
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
Fri Mar 19 16:29:50 PST 1999 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* acinclude.m4
|
||||||
|
* config.guess
|
||||||
|
* config.sub
|
||||||
|
* ltconfig
|
||||||
|
* ltmain.sh: upgrade to libtool 1.2f
|
||||||
|
|
||||||
|
* autogen.sh: libtool is not required to autogen glib
|
||||||
|
|
||||||
|
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
|
||||||
|
needed)
|
||||||
|
|
||||||
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
1999-03-18 Jeff Garzik <jgarzik@pobox.com>
|
||||||
|
|
||||||
* glib.def: Add new g_list, g_stack, g_queue functions.
|
* glib.def: Add new g_list, g_stack, g_queue functions.
|
||||||
|
@ -71,8 +71,6 @@
|
|||||||
#undef NO_SYS_SIGLIST
|
#undef NO_SYS_SIGLIST
|
||||||
#undef NO_SYS_SIGLIST_DECL
|
#undef NO_SYS_SIGLIST_DECL
|
||||||
|
|
||||||
#undef WITH_SYMBOL_UNDERSCORE
|
|
||||||
|
|
||||||
#undef SIZEOF_CHAR
|
#undef SIZEOF_CHAR
|
||||||
#undef SIZEOF_SHORT
|
#undef SIZEOF_SHORT
|
||||||
#undef SIZEOF_LONG
|
#undef SIZEOF_LONG
|
||||||
|
474
acinclude.m4
474
acinclude.m4
@ -1,5 +1,5 @@
|
|||||||
## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
|
## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
|
||||||
## Copyright (C) 1996-1998 Free Software Foundation, Inc.
|
## Copyright (C) 1996-1999 Free Software Foundation, Inc.
|
||||||
## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||||
##
|
##
|
||||||
## This program is free software; you can redistribute it and/or modify
|
## This program is free software; you can redistribute it and/or modify
|
||||||
@ -21,28 +21,58 @@
|
|||||||
## configuration script generated by Autoconf, you may include it under
|
## configuration script generated by Autoconf, you may include it under
|
||||||
## the same distribution terms that you use for the rest of that program.
|
## the same distribution terms that you use for the rest of that program.
|
||||||
|
|
||||||
# serial 29 AM_PROG_LIBTOOL
|
# serial 35 AC_PROG_LIBTOOL
|
||||||
AC_DEFUN(AM_PROG_LIBTOOL,
|
AC_DEFUN(AC_PROG_LIBTOOL,
|
||||||
[AC_REQUIRE([AM_ENABLE_SHARED])dnl
|
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
|
||||||
AC_REQUIRE([AM_ENABLE_STATIC])dnl
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
# Save cache, so that ltconfig can load it
|
||||||
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
AC_CACHE_SAVE
|
||||||
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|
||||||
AC_REQUIRE([AC_PROG_CC])dnl
|
# Actually configure libtool. ac_aux_dir is where install-sh is found.
|
||||||
AC_REQUIRE([AM_PROG_LD])dnl
|
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
|
||||||
AC_REQUIRE([AM_PROG_NM])dnl
|
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
|
||||||
AC_REQUIRE([AM_SYS_NM_PARSE])dnl
|
DLLTOOL="$DLLTOOL" AS="$AS" \
|
||||||
AC_REQUIRE([AM_SYS_SYMBOL_UNDERSCORE])dnl
|
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
||||||
AC_REQUIRE([AC_PROG_LN_S])dnl
|
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||||
dnl
|
|| AC_MSG_ERROR([libtool configure failed])
|
||||||
|
|
||||||
|
# Reload cache, that may have been modified by ltconfig
|
||||||
|
AC_CACHE_LOAD
|
||||||
|
|
||||||
|
# This can be used to rebuild libtool when needed
|
||||||
|
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
|
||||||
|
|
||||||
# Always use our own libtool.
|
# Always use our own libtool.
|
||||||
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||||
AC_SUBST(LIBTOOL)dnl
|
AC_SUBST(LIBTOOL)dnl
|
||||||
|
|
||||||
|
# Redirect the config.log output again, so that the ltconfig log is not
|
||||||
|
# clobbered by the next message.
|
||||||
|
exec 5>>./config.log
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN(AC_LIBTOOL_SETUP,
|
||||||
|
[AC_PREREQ(2.13)dnl
|
||||||
|
AC_REQUIRE([AC_ENABLE_SHARED])dnl
|
||||||
|
AC_REQUIRE([AC_ENABLE_STATIC])dnl
|
||||||
|
AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||||
|
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
||||||
|
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
||||||
|
AC_REQUIRE([AC_PROG_CC])dnl
|
||||||
|
AC_REQUIRE([AC_PROG_LD])dnl
|
||||||
|
AC_REQUIRE([AC_PROG_NM])dnl
|
||||||
|
AC_REQUIRE([AC_SYS_NM_PARSE])dnl
|
||||||
|
AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
|
||||||
|
AC_REQUIRE([AC_PROG_LN_S])dnl
|
||||||
|
dnl
|
||||||
|
|
||||||
# Check for any special flags to pass to ltconfig.
|
# Check for any special flags to pass to ltconfig.
|
||||||
libtool_flags=
|
libtool_flags="--cache-file=$cache_file"
|
||||||
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
|
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
|
||||||
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
|
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
|
||||||
|
test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
|
||||||
|
test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
|
||||||
test "$silent" = yes && libtool_flags="$libtool_flags --silent"
|
test "$silent" = yes && libtool_flags="$libtool_flags --silent"
|
||||||
test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
|
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"
|
test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
|
||||||
@ -81,8 +111,8 @@ case "$host" in
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-cygwin32*)
|
*-*-cygwin*)
|
||||||
AM_SYS_LIBTOOL_CYGWIN32
|
AC_SYS_LIBTOOL_CYGWIN
|
||||||
;;
|
;;
|
||||||
|
|
||||||
esac
|
esac
|
||||||
@ -97,30 +127,20 @@ need_locks=yes)
|
|||||||
if test x"$need_locks" = xno; then
|
if test x"$need_locks" = xno; then
|
||||||
libtool_flags="$libtool_flags --disable-lock"
|
libtool_flags="$libtool_flags --disable-lock"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Actually configure libtool. ac_aux_dir is where install-sh is found.
|
|
||||||
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
|
|
||||||
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
|
|
||||||
DLLTOOL="$DLLTOOL" AS="$AS" \
|
|
||||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
|
||||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
|
||||||
|| AC_MSG_ERROR([libtool configure failed])
|
|
||||||
|
|
||||||
# Redirect the config.log output again, so that the ltconfig log is not
|
|
||||||
# clobbered by the next message.
|
|
||||||
exec 5>>./config.log
|
|
||||||
])
|
])
|
||||||
|
|
||||||
# AM_ENABLE_SHARED - implement the --enable-shared flag
|
# AC_LIBTOOL_DLOPEN - check for dlopen support
|
||||||
# Usage: AM_ENABLE_SHARED[(DEFAULT)]
|
AC_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes])
|
||||||
|
|
||||||
|
# AC_ENABLE_SHARED - implement the --enable-shared flag
|
||||||
|
# Usage: AC_ENABLE_SHARED[(DEFAULT)]
|
||||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||||
# `yes'.
|
# `yes'.
|
||||||
AC_DEFUN(AM_ENABLE_SHARED,
|
AC_DEFUN(AC_ENABLE_SHARED,
|
||||||
[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||||
AC_ARG_ENABLE(shared,
|
AC_ARG_ENABLE(shared,
|
||||||
changequote(<<, >>)dnl
|
changequote(<<, >>)dnl
|
||||||
<< --enable-shared[=PKGS] build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT],
|
<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
|
||||||
changequote([, ])dnl
|
changequote([, ])dnl
|
||||||
[p=${PACKAGE-default}
|
[p=${PACKAGE-default}
|
||||||
case "$enableval" in
|
case "$enableval" in
|
||||||
@ -138,26 +158,22 @@ no) enable_shared=no ;;
|
|||||||
IFS="$ac_save_ifs"
|
IFS="$ac_save_ifs"
|
||||||
;;
|
;;
|
||||||
esac],
|
esac],
|
||||||
enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
|
enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
|
||||||
])
|
])
|
||||||
|
|
||||||
# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
|
# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
|
||||||
AC_DEFUN(AM_DISABLE_SHARED,
|
AC_DEFUN(AC_DISABLE_SHARED,
|
||||||
[AM_ENABLE_SHARED(no)])
|
[AC_ENABLE_SHARED(no)])
|
||||||
|
|
||||||
# AM_DISABLE_STATIC - set the default static flag to --disable-static
|
# AC_ENABLE_STATIC - implement the --enable-static flag
|
||||||
AC_DEFUN(AM_DISABLE_STATIC,
|
# Usage: AC_ENABLE_STATIC[(DEFAULT)]
|
||||||
[AM_ENABLE_STATIC(no)])
|
|
||||||
|
|
||||||
# AM_ENABLE_STATIC - implement the --enable-static flag
|
|
||||||
# Usage: AM_ENABLE_STATIC[(DEFAULT)]
|
|
||||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||||
# `yes'.
|
# `yes'.
|
||||||
AC_DEFUN(AM_ENABLE_STATIC,
|
AC_DEFUN(AC_ENABLE_STATIC,
|
||||||
[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||||
AC_ARG_ENABLE(static,
|
AC_ARG_ENABLE(static,
|
||||||
changequote(<<, >>)dnl
|
changequote(<<, >>)dnl
|
||||||
<< --enable-static[=PKGS] build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT],
|
<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
|
||||||
changequote([, ])dnl
|
changequote([, ])dnl
|
||||||
[p=${PACKAGE-default}
|
[p=${PACKAGE-default}
|
||||||
case "$enableval" in
|
case "$enableval" in
|
||||||
@ -175,12 +191,50 @@ no) enable_static=no ;;
|
|||||||
IFS="$ac_save_ifs"
|
IFS="$ac_save_ifs"
|
||||||
;;
|
;;
|
||||||
esac],
|
esac],
|
||||||
enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
|
enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
|
||||||
])
|
])
|
||||||
|
|
||||||
|
# AC_DISABLE_STATIC - set the default static flag to --disable-static
|
||||||
|
AC_DEFUN(AC_DISABLE_STATIC,
|
||||||
|
[AC_ENABLE_STATIC(no)])
|
||||||
|
|
||||||
# AM_PROG_LD - find the path to the GNU or non-GNU linker
|
|
||||||
AC_DEFUN(AM_PROG_LD,
|
# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
|
||||||
|
# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
|
||||||
|
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||||
|
# `yes'.
|
||||||
|
AC_DEFUN(AC_ENABLE_FAST_INSTALL,
|
||||||
|
[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||||
|
AC_ARG_ENABLE(fast-install,
|
||||||
|
changequote(<<, >>)dnl
|
||||||
|
<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
|
||||||
|
changequote([, ])dnl
|
||||||
|
[p=${PACKAGE-default}
|
||||||
|
case "$enableval" in
|
||||||
|
yes) enable_fast_install=yes ;;
|
||||||
|
no) enable_fast_install=no ;;
|
||||||
|
*)
|
||||||
|
enable_fast_install=no
|
||||||
|
# Look at the argument we got. We use all the common list separators.
|
||||||
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
|
||||||
|
for pkg in $enableval; do
|
||||||
|
if test "X$pkg" = "X$p"; then
|
||||||
|
enable_fast_install=yes
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS="$ac_save_ifs"
|
||||||
|
;;
|
||||||
|
esac],
|
||||||
|
enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
|
||||||
|
])
|
||||||
|
|
||||||
|
# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
|
||||||
|
AC_DEFUN(AC_DISABLE_FAST_INSTALL,
|
||||||
|
[AC_ENABLE_FAST_INSTALL(no)])
|
||||||
|
|
||||||
|
|
||||||
|
# AC_PROG_LD - find the path to the GNU or non-GNU linker
|
||||||
|
AC_DEFUN(AC_PROG_LD,
|
||||||
[AC_ARG_WITH(gnu-ld,
|
[AC_ARG_WITH(gnu-ld,
|
||||||
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
||||||
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
||||||
@ -195,47 +249,15 @@ if test "$ac_cv_prog_gcc" = yes; then
|
|||||||
case "$ac_prog" in
|
case "$ac_prog" in
|
||||||
# Accept absolute paths.
|
# Accept absolute paths.
|
||||||
changequote(,)dnl
|
changequote(,)dnl
|
||||||
/* | [A-Za-z]:/*)
|
/* | [A-Za-z]:[\\/]*)
|
||||||
# Canonicalize the path of ld
|
|
||||||
re_direlt='/[^/][^/]*/\.\./'
|
re_direlt='/[^/][^/]*/\.\./'
|
||||||
sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
|
|
||||||
changequote([,])dnl
|
changequote([,])dnl
|
||||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
|
||||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
|
||||||
done
|
|
||||||
case "$host_os" in
|
|
||||||
cygwin*)
|
|
||||||
# Convert to a UNC path for cygwin
|
|
||||||
test -z "$LD" && LD=`echo X$ac_prog | sed -e "1s/^X//" -e "$sub_uncdrive"`
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
test -z "$LD" && LD="$ac_prog"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
##
|
|
||||||
## FIXME: The code fails later on if we try to use an $LD with
|
|
||||||
## '\\' path separators.
|
|
||||||
##
|
|
||||||
changequote(,)dnl
|
|
||||||
[A-Za-z]:[\\]*)
|
|
||||||
# Canonicalize the path of ld
|
# Canonicalize the path of ld
|
||||||
re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
|
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
||||||
sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
|
|
||||||
changequote([,])dnl
|
|
||||||
sub_uncdir='s%\\%/%g'
|
|
||||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
||||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
|
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
||||||
done
|
done
|
||||||
case "$host_os" in
|
test -z "$LD" && LD="$ac_prog"
|
||||||
cygwin*)
|
|
||||||
# Convert to a UNC path for cygwin
|
|
||||||
test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
test -z "$LD" && LD="$ac_prog"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
;;
|
||||||
"")
|
"")
|
||||||
# If it fails, then pretend we aren't using GCC.
|
# If it fails, then pretend we aren't using GCC.
|
||||||
@ -264,7 +286,7 @@ AC_CACHE_VAL(ac_cv_path_LD,
|
|||||||
if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
|
if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
|
||||||
test "$with_gnu_ld" != no && break
|
test "$with_gnu_ld" != no && break
|
||||||
else
|
else
|
||||||
test "$with_gnu_ld" != yes && break
|
test "$with_gnu_ld" != yes && break
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@ -280,10 +302,10 @@ else
|
|||||||
fi
|
fi
|
||||||
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
||||||
AC_SUBST(LD)
|
AC_SUBST(LD)
|
||||||
AM_PROG_LD_GNU
|
AC_PROG_LD_GNU
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN(AM_PROG_LD_GNU,
|
AC_DEFUN(AC_PROG_LD_GNU,
|
||||||
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
|
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
|
||||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
||||||
if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
||||||
@ -293,8 +315,8 @@ else
|
|||||||
fi])
|
fi])
|
||||||
])
|
])
|
||||||
|
|
||||||
# AM_PROG_NM - find the path to a BSD-compatible name lister
|
# AC_PROG_NM - find the path to a BSD-compatible name lister
|
||||||
AC_DEFUN(AM_PROG_NM,
|
AC_DEFUN(AC_PROG_NM,
|
||||||
[AC_MSG_CHECKING([for BSD-compatible nm])
|
[AC_MSG_CHECKING([for BSD-compatible nm])
|
||||||
AC_CACHE_VAL(ac_cv_path_NM,
|
AC_CACHE_VAL(ac_cv_path_NM,
|
||||||
[if test -n "$NM"; then
|
[if test -n "$NM"; then
|
||||||
@ -302,20 +324,22 @@ AC_CACHE_VAL(ac_cv_path_NM,
|
|||||||
ac_cv_path_NM="$NM"
|
ac_cv_path_NM="$NM"
|
||||||
else
|
else
|
||||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||||
for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
|
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
|
||||||
test -z "$ac_dir" && ac_dir=.
|
test -z "$ac_dir" && ac_dir=.
|
||||||
if test -f $ac_dir/nm; then
|
if test -f $ac_dir/nm; then
|
||||||
# Check to see if the nm accepts a BSD-compat flag.
|
# Check to see if the nm accepts a BSD-compat flag.
|
||||||
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
||||||
# nm: unknown option "B" ignored
|
# nm: unknown option "B" ignored
|
||||||
if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
|
if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
|
||||||
ac_cv_path_NM="$ac_dir/nm -B"
|
ac_cv_path_NM="$ac_dir/nm -B"
|
||||||
|
break
|
||||||
elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
|
elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
|
||||||
ac_cv_path_NM="$ac_dir/nm -p"
|
ac_cv_path_NM="$ac_dir/nm -p"
|
||||||
|
break
|
||||||
else
|
else
|
||||||
ac_cv_path_NM="$ac_dir/nm"
|
ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
|
||||||
|
continue # so that we can try to find one that supports BSD flags
|
||||||
fi
|
fi
|
||||||
break
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
IFS="$ac_save_ifs"
|
IFS="$ac_save_ifs"
|
||||||
@ -326,11 +350,11 @@ AC_MSG_RESULT([$NM])
|
|||||||
AC_SUBST(NM)
|
AC_SUBST(NM)
|
||||||
])
|
])
|
||||||
|
|
||||||
# AM_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
|
# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed
|
||||||
# by C symbol name from nm.
|
# by C symbol name from nm.
|
||||||
AC_DEFUN(AM_SYS_NM_PARSE,
|
AC_DEFUN(AC_SYS_NM_PARSE,
|
||||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||||
AC_REQUIRE([AM_PROG_NM])dnl
|
AC_REQUIRE([AC_PROG_NM])dnl
|
||||||
# Check for command to grab the raw symbol name followed by C symbol from nm.
|
# Check for command to grab the raw symbol name followed by C symbol from nm.
|
||||||
AC_MSG_CHECKING([command to parse $NM output])
|
AC_MSG_CHECKING([command to parse $NM output])
|
||||||
AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
|
AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
|
||||||
@ -339,52 +363,51 @@ AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
|
|||||||
|
|
||||||
changequote(,)dnl
|
changequote(,)dnl
|
||||||
# Character class describing NM global symbol codes.
|
# Character class describing NM global symbol codes.
|
||||||
ac_symcode='[BCDEGRSTU]'
|
ac_symcode='[BCDEGRST]'
|
||||||
|
|
||||||
# Regexp to match symbols that can be accessed directly from C.
|
# Regexp to match symbols that can be accessed directly from C.
|
||||||
ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
|
ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
|
||||||
|
|
||||||
# Transform the above into a raw symbol and a C symbol.
|
# Transform the above into a raw symbol and a C symbol.
|
||||||
ac_symxfrm='\1 \1'
|
ac_symxfrm='\1 \2\3 \3'
|
||||||
|
|
||||||
|
# Transform an extracted symbol line into a proper C declaration
|
||||||
|
ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
|
||||||
|
|
||||||
# Define system-specific variables.
|
# Define system-specific variables.
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
aix*)
|
aix*)
|
||||||
ac_symcode='[BCDTU]'
|
ac_symcode='[BCDT]'
|
||||||
;;
|
;;
|
||||||
sunos* | cygwin32* | mingw32*)
|
cygwin* | mingw*)
|
||||||
ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
|
ac_symcode='[ABCDGISTW]'
|
||||||
ac_symxfrm='_\1 \1'
|
;;
|
||||||
|
hpux*)
|
||||||
|
ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
|
||||||
;;
|
;;
|
||||||
irix*)
|
irix*)
|
||||||
# Cannot use undefined symbols on IRIX because inlined functions mess us up.
|
|
||||||
ac_symcode='[BCDEGRST]'
|
ac_symcode='[BCDEGRST]'
|
||||||
;;
|
;;
|
||||||
solaris*)
|
solaris*)
|
||||||
ac_symcode='[BDTU]'
|
ac_symcode='[BDT]'
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# If we're using GNU nm, then use its standard symbol codes.
|
# If we're using GNU nm, then use its standard symbol codes.
|
||||||
if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
|
if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
|
||||||
ac_symcode='[ABCDGISTUW]'
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$host_os" in
|
|
||||||
cygwin32* | mingw32*)
|
|
||||||
# We do not want undefined symbols on cygwin32. The user must
|
|
||||||
# arrange to define them via -l arguments.
|
|
||||||
ac_symcode='[ABCDGISTW]'
|
ac_symcode='[ABCDGISTW]'
|
||||||
;;
|
fi
|
||||||
esac
|
|
||||||
changequote([,])dnl
|
changequote([,])dnl
|
||||||
|
|
||||||
# Write the raw and C identifiers.
|
# Try without a prefix undercore, then with it.
|
||||||
ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'"
|
for ac_symprfx in "" "_"; do
|
||||||
|
|
||||||
# Check to see that the pipe works correctly.
|
ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($ac_symcode\)[ ][ ]*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
|
||||||
ac_pipe_works=no
|
|
||||||
cat > conftest.$ac_ext <<EOF
|
# Check to see that the pipe works correctly.
|
||||||
|
ac_pipe_works=no
|
||||||
|
rm -f conftest.$ac_ext
|
||||||
|
cat > conftest.$ac_ext <<EOF
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
@ -395,96 +418,100 @@ void nm_test_func(){}
|
|||||||
#endif
|
#endif
|
||||||
int main(){nm_test_var='a';nm_test_func;return 0;}
|
int main(){nm_test_var='a';nm_test_func;return 0;}
|
||||||
EOF
|
EOF
|
||||||
if AC_TRY_EVAL(ac_compile); then
|
|
||||||
# Now try to grab the symbols.
|
|
||||||
ac_nlist=conftest.nm
|
|
||||||
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
|
|
||||||
|
|
||||||
# Try sorting and uniquifying the output.
|
if AC_TRY_EVAL(ac_compile); then
|
||||||
if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
|
# Now try to grab the symbols.
|
||||||
mv -f "$ac_nlist"T "$ac_nlist"
|
ac_nlist=conftest.nm
|
||||||
ac_wcout=`wc "$ac_nlist" 2>/dev/null`
|
|
||||||
changequote(,)dnl
|
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
|
||||||
ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'`
|
|
||||||
changequote([,])dnl
|
|
||||||
(test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
|
|
||||||
else
|
|
||||||
rm -f "$ac_nlist"T
|
|
||||||
ac_count=-1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Make sure that we snagged all the symbols we need.
|
# Try sorting and uniquifying the output.
|
||||||
if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
|
if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
|
||||||
if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
|
mv -f "$ac_nlist"T "$ac_nlist"
|
||||||
cat <<EOF > conftest.c
|
else
|
||||||
|
rm -f "$ac_nlist"T
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Make sure that we snagged all the symbols we need.
|
||||||
|
if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
|
||||||
|
if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
|
||||||
|
cat <<EOF > conftest.c
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
# Now generate the symbol file.
|
# Now generate the symbol file.
|
||||||
sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
|
eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
|
||||||
|
|
||||||
cat <<EOF >> conftest.c
|
cat <<EOF >> conftest.c
|
||||||
#if defined (__STDC__) && __STDC__
|
#if defined (__STDC__) && __STDC__
|
||||||
# define __ptr_t void *
|
# define lt_ptr_t void *
|
||||||
#else
|
#else
|
||||||
# define __ptr_t char *
|
# define lt_ptr_t char *
|
||||||
|
# define const
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
|
|
||||||
int dld_preloaded_symbol_count = $ac_count;
|
|
||||||
|
|
||||||
/* The mapping between symbol names and symbols. */
|
/* The mapping between symbol names and symbols. */
|
||||||
struct {
|
const struct {
|
||||||
char *name;
|
const char *name;
|
||||||
__ptr_t address;
|
lt_ptr_t address;
|
||||||
}
|
}
|
||||||
changequote(,)dnl
|
changequote(,)dnl
|
||||||
dld_preloaded_symbols[] =
|
lt_preloaded_symbols[] =
|
||||||
changequote([,])dnl
|
changequote([,])dnl
|
||||||
{
|
{
|
||||||
EOF
|
EOF
|
||||||
sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
|
sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
|
||||||
cat <<\EOF >> conftest.c
|
cat <<\EOF >> conftest.c
|
||||||
{0, (__ptr_t) 0}
|
{0, (lt_ptr_t) 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
EOF
|
EOF
|
||||||
# Now try linking the two files.
|
# Now try linking the two files.
|
||||||
mv conftest.$ac_objext conftestm.$ac_objext
|
mv conftest.$ac_objext conftestm.$ac_objext
|
||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
ac_save_CFLAGS="$CFLAGS"
|
||||||
LIBS="conftestm.$ac_objext"
|
LIBS="conftestm.$ac_objext"
|
||||||
CFLAGS="$CFLAGS$no_builtin_flag"
|
CFLAGS="$CFLAGS$no_builtin_flag"
|
||||||
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
||||||
ac_pipe_works=yes
|
ac_pipe_works=yes
|
||||||
else
|
else
|
||||||
echo "configure: failed program was:" >&AC_FD_CC
|
echo "configure: failed program was:" >&AC_FD_CC
|
||||||
cat conftest.c >&AC_FD_CC
|
cat conftest.c >&AC_FD_CC
|
||||||
fi
|
fi
|
||||||
LIBS="$ac_save_LIBS"
|
LIBS="$ac_save_LIBS"
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
CFLAGS="$ac_save_CFLAGS"
|
||||||
|
else
|
||||||
|
echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
|
echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
|
echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
|
echo "$progname: failed program was:" >&AC_FD_CC
|
||||||
|
cat conftest.c >&AC_FD_CC
|
||||||
fi
|
fi
|
||||||
else
|
rm -rf conftest*
|
||||||
echo "$progname: failed program was:" >&AC_FD_CC
|
|
||||||
cat conftest.c >&AC_FD_CC
|
|
||||||
fi
|
|
||||||
rm -rf conftest*
|
|
||||||
|
|
||||||
# Do not use the global_symbol_pipe unless it works.
|
# Do not use the global_symbol_pipe unless it works.
|
||||||
test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe=
|
if test "$ac_pipe_works" = yes; then
|
||||||
|
if test x"$ac_symprfx" = x"_"; then
|
||||||
|
ac_cv_sys_symbol_underscore=yes
|
||||||
|
else
|
||||||
|
ac_cv_sys_symbol_underscore=no
|
||||||
|
fi
|
||||||
|
break
|
||||||
|
else
|
||||||
|
ac_cv_sys_global_symbol_pipe=
|
||||||
|
fi
|
||||||
|
done
|
||||||
])
|
])
|
||||||
|
|
||||||
ac_result=yes
|
ac_result=yes
|
||||||
@ -494,17 +521,17 @@ fi
|
|||||||
AC_MSG_RESULT($ac_result)
|
AC_MSG_RESULT($ac_result)
|
||||||
])
|
])
|
||||||
|
|
||||||
# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
|
# AC_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
|
||||||
AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32,
|
AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN,
|
||||||
[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
||||||
AC_CHECK_TOOL(AS, as, false)
|
AC_CHECK_TOOL(AS, as, false)
|
||||||
])
|
])
|
||||||
|
|
||||||
# AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
|
# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
|
||||||
# with an underscore?
|
# with an underscore?
|
||||||
AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE,
|
AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE,
|
||||||
[AC_REQUIRE([AM_PROG_NM])dnl
|
[AC_REQUIRE([AC_PROG_NM])dnl
|
||||||
AC_REQUIRE([AM_SYS_NM_PARSE])dnl
|
AC_REQUIRE([AC_SYS_NM_PARSE])dnl
|
||||||
AC_MSG_CHECKING([for _ prefix in compiled symbols])
|
AC_MSG_CHECKING([for _ prefix in compiled symbols])
|
||||||
AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
|
AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
|
||||||
[ac_cv_sys_symbol_underscore=no
|
[ac_cv_sys_symbol_underscore=no
|
||||||
@ -517,13 +544,13 @@ if AC_TRY_EVAL(ac_compile); then
|
|||||||
ac_nlist=conftest.nm
|
ac_nlist=conftest.nm
|
||||||
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
|
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
|
||||||
# See whether the symbols have a leading underscore.
|
# See whether the symbols have a leading underscore.
|
||||||
if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
|
if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
|
||||||
ac_cv_sys_symbol_underscore=yes
|
ac_cv_sys_symbol_underscore=yes
|
||||||
else
|
else
|
||||||
if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
|
if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
|
echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
@ -536,8 +563,63 @@ fi
|
|||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
])
|
])
|
||||||
AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
|
AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
|
||||||
if test x$ac_cv_sys_symbol_underscore = xyes; then
|
USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
|
||||||
AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
|
AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
|
||||||
[define if compiled symbols have a leading underscore])
|
|
||||||
fi
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
# AC_CHECK_LIBM - check for math library
|
||||||
|
AC_DEFUN(AC_CHECK_LIBM, [
|
||||||
|
AC_CHECK_LIB(mw, _mwvalidcheckl)
|
||||||
|
AC_CHECK_LIB(m, cos)
|
||||||
|
])
|
||||||
|
|
||||||
|
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
|
||||||
|
# the libltdl convenience library, adds --enable-ltdl-convenience to
|
||||||
|
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
|
||||||
|
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
|
||||||
|
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
|
||||||
|
# '${top_builddir}/' (note the single quotes!) if your package is not
|
||||||
|
# flat, and, if you're not using automake, define top_builddir as
|
||||||
|
# appropriate in the Makefiles.
|
||||||
|
AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
|
||||||
|
case "$enable_ltdl_convenience" in
|
||||||
|
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
|
||||||
|
"") enable_ltdl_convenience=yes
|
||||||
|
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
|
||||||
|
esac
|
||||||
|
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
|
||||||
|
])
|
||||||
|
|
||||||
|
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
|
||||||
|
# the libltdl installable library, and adds --enable-ltdl-install to
|
||||||
|
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
|
||||||
|
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
|
||||||
|
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
|
||||||
|
# '${top_builddir}/' (note the single quotes!) if your package is not
|
||||||
|
# flat, and, if you're not using automake, define top_builddir as
|
||||||
|
# appropriate in the Makefiles.
|
||||||
|
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
|
||||||
|
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
|
||||||
|
AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
|
||||||
|
case "$enable_ltdl_install" in
|
||||||
|
no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
|
||||||
|
"") enable_ltdl_install=yes
|
||||||
|
ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
|
||||||
|
esac
|
||||||
|
])
|
||||||
|
if test x"$enable_ltdl_install" != x"no"; then
|
||||||
|
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl old names
|
||||||
|
AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
|
||||||
|
AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
|
||||||
|
AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
|
||||||
|
AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
|
||||||
|
AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
|
||||||
|
AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
|
||||||
|
AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
|
||||||
|
AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
|
||||||
|
AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl
|
||||||
|
AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl
|
||||||
|
@ -20,14 +20,6 @@ DIE=0
|
|||||||
DIE=1
|
DIE=1
|
||||||
}
|
}
|
||||||
|
|
||||||
(libtool --version) < /dev/null > /dev/null 2>&1 || {
|
|
||||||
echo
|
|
||||||
echo "You must have libtool installed to compile $PROJECT."
|
|
||||||
echo "Get ftp://alpha.gnu.org/gnu/libtool-1.2d.tar.gz"
|
|
||||||
echo "(or a newer version if it is available)"
|
|
||||||
DIE=1
|
|
||||||
}
|
|
||||||
|
|
||||||
(automake --version) < /dev/null > /dev/null 2>&1 || {
|
(automake --version) < /dev/null > /dev/null 2>&1 || {
|
||||||
echo
|
echo
|
||||||
echo "You must have automake installed to compile $PROJECT."
|
echo "You must have automake installed to compile $PROJECT."
|
||||||
|
163
config.guess
vendored
163
config.guess
vendored
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
# Written by Per Bothner <bothner@cygnus.com>.
|
# Written by Per Bothner <bothner@cygnus.com>.
|
||||||
# The master version of this file is at the FSF in /home/gd/gnu/lib.
|
# The master version of this file is at the FSF in /home/gd/gnu/lib.
|
||||||
|
# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
|
||||||
#
|
#
|
||||||
# This script attempts to guess a canonical system name similar to
|
# This script attempts to guess a canonical system name similar to
|
||||||
# config.sub. If it succeeds, it prints the system name on stdout, and
|
# config.sub. If it succeeds, it prints the system name on stdout, and
|
||||||
@ -46,7 +47,8 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
|||||||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||||
|
|
||||||
trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
|
dummy=dummy-$$
|
||||||
|
trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
|
||||||
|
|
||||||
# Note: order is significant - the case branches are not exclusive.
|
# Note: order is significant - the case branches are not exclusive.
|
||||||
|
|
||||||
@ -59,7 +61,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||||||
# A Tn.n version is a released field test version.
|
# A Tn.n version is a released field test version.
|
||||||
# A Xn.n version is an unreleased experimental baselevel.
|
# A Xn.n version is an unreleased experimental baselevel.
|
||||||
# 1.2 uses "1.2" for uname -r.
|
# 1.2 uses "1.2" for uname -r.
|
||||||
cat <<EOF >dummy.s
|
cat <<EOF >$dummy.s
|
||||||
.globl main
|
.globl main
|
||||||
.ent main
|
.ent main
|
||||||
main:
|
main:
|
||||||
@ -76,9 +78,9 @@ main:
|
|||||||
ret \$31,(\$26),1
|
ret \$31,(\$26),1
|
||||||
.end main
|
.end main
|
||||||
EOF
|
EOF
|
||||||
${CC-cc} dummy.s -o dummy 2>/dev/null
|
${CC-cc} $dummy.s -o $dummy 2>/dev/null
|
||||||
if test "$?" = 0 ; then
|
if test "$?" = 0 ; then
|
||||||
./dummy
|
./$dummy
|
||||||
case "$?" in
|
case "$?" in
|
||||||
7)
|
7)
|
||||||
UNAME_MACHINE="alpha"
|
UNAME_MACHINE="alpha"
|
||||||
@ -97,7 +99,7 @@ EOF
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
rm -f dummy.s dummy
|
rm -f $dummy.s $dummy
|
||||||
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
|
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
21064:Windows_NT:50:3)
|
21064:Windows_NT:50:3)
|
||||||
@ -150,7 +152,7 @@ EOF
|
|||||||
echo pyramid-pyramid-bsd
|
echo pyramid-pyramid-bsd
|
||||||
fi
|
fi
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
NILE:*:*:dcosx)
|
NILE*:*:*:dcosx)
|
||||||
echo pyramid-pyramid-svr4
|
echo pyramid-pyramid-svr4
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
sun4H:SunOS:5.*:*)
|
sun4H:SunOS:5.*:*)
|
||||||
@ -238,8 +240,12 @@ EOF
|
|||||||
echo clipper-intergraph-clix${UNAME_RELEASE}
|
echo clipper-intergraph-clix${UNAME_RELEASE}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
mips:*:*:UMIPS | mips:*:*:RISCos)
|
mips:*:*:UMIPS | mips:*:*:RISCos)
|
||||||
sed 's/^ //' << EOF >dummy.c
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
int main (argc, argv) int argc; char **argv; {
|
#ifdef __cplusplus
|
||||||
|
int main (int argc, char *argv[]) {
|
||||||
|
#else
|
||||||
|
int main (argc, argv) int argc; char *argv[]; {
|
||||||
|
#endif
|
||||||
#if defined (host_mips) && defined (MIPSEB)
|
#if defined (host_mips) && defined (MIPSEB)
|
||||||
#if defined (SYSTYPE_SYSV)
|
#if defined (SYSTYPE_SYSV)
|
||||||
printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
|
printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
|
||||||
@ -254,10 +260,10 @@ EOF
|
|||||||
exit (-1);
|
exit (-1);
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
${CC-cc} dummy.c -o dummy \
|
${CC-cc} $dummy.c -o $dummy \
|
||||||
&& ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
|
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
|
||||||
&& rm dummy.c dummy && exit 0
|
&& rm $dummy.c $dummy && exit 0
|
||||||
rm -f dummy.c dummy
|
rm -f $dummy.c $dummy
|
||||||
echo mips-mips-riscos${UNAME_RELEASE}
|
echo mips-mips-riscos${UNAME_RELEASE}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
Night_Hawk:Power_UNIX:*:*)
|
Night_Hawk:Power_UNIX:*:*)
|
||||||
@ -309,7 +315,7 @@ EOF
|
|||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
*:AIX:2:3)
|
*:AIX:2:3)
|
||||||
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
|
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
|
||||||
sed 's/^ //' << EOF >dummy.c
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
#include <sys/systemcfg.h>
|
#include <sys/systemcfg.h>
|
||||||
|
|
||||||
main()
|
main()
|
||||||
@ -320,8 +326,8 @@ EOF
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
|
${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
|
||||||
rm -f dummy.c dummy
|
rm -f $dummy.c $dummy
|
||||||
echo rs6000-ibm-aix3.2.5
|
echo rs6000-ibm-aix3.2.5
|
||||||
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
|
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
|
||||||
echo rs6000-ibm-aix3.2.4
|
echo rs6000-ibm-aix3.2.4
|
||||||
@ -368,25 +374,25 @@ EOF
|
|||||||
case "${UNAME_MACHINE}" in
|
case "${UNAME_MACHINE}" in
|
||||||
9000/31? ) HP_ARCH=m68000 ;;
|
9000/31? ) HP_ARCH=m68000 ;;
|
||||||
9000/[34]?? ) HP_ARCH=m68k ;;
|
9000/[34]?? ) HP_ARCH=m68k ;;
|
||||||
9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
|
9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 )
|
||||||
sed 's/^ //' << EOF >dummy.c
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
int main ()
|
int main ()
|
||||||
{
|
{
|
||||||
#if defined(_SC_KERNEL_BITS)
|
#if defined(_SC_KERNEL_BITS)
|
||||||
long bits = sysconf(_SC_KERNEL_BITS);
|
long bits = sysconf(_SC_KERNEL_BITS);
|
||||||
#endif
|
#endif
|
||||||
long cpu = sysconf (_SC_CPU_VERSION);
|
long cpu = sysconf (_SC_CPU_VERSION);
|
||||||
|
|
||||||
switch (cpu)
|
switch (cpu)
|
||||||
{
|
{
|
||||||
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
||||||
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
||||||
case CPU_PA_RISC2_0:
|
case CPU_PA_RISC2_0:
|
||||||
#if defined(_SC_KERNEL_BITS)
|
#if defined(_SC_KERNEL_BITS)
|
||||||
switch (bits)
|
switch (bits)
|
||||||
{
|
{
|
||||||
case 64: puts ("hppa2.0w"); break;
|
case 64: puts ("hppa2.0w"); break;
|
||||||
case 32: puts ("hppa2.0n"); break;
|
case 32: puts ("hppa2.0n"); break;
|
||||||
@ -394,20 +400,20 @@ EOF
|
|||||||
} break;
|
} break;
|
||||||
#else /* !defined(_SC_KERNEL_BITS) */
|
#else /* !defined(_SC_KERNEL_BITS) */
|
||||||
puts ("hppa2.0"); break;
|
puts ("hppa2.0"); break;
|
||||||
#endif
|
#endif
|
||||||
default: puts ("hppa1.0"); break;
|
default: puts ("hppa1.0"); break;
|
||||||
}
|
}
|
||||||
exit (0);
|
exit (0);
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
|
(${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
|
||||||
rm -f dummy.c dummy
|
rm -f $dummy.c $dummy
|
||||||
esac
|
esac
|
||||||
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
|
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
|
||||||
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
|
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
3050*:HI-UX:*:*)
|
3050*:HI-UX:*:*)
|
||||||
sed 's/^ //' << EOF >dummy.c
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
@ -432,8 +438,8 @@ EOF
|
|||||||
exit (0);
|
exit (0);
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
|
${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
|
||||||
rm -f dummy.c dummy
|
rm -f $dummy.c $dummy
|
||||||
echo unknown-hitachi-hiuxwe2
|
echo unknown-hitachi-hiuxwe2
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
|
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
|
||||||
@ -442,6 +448,12 @@ EOF
|
|||||||
9000/8??:4.3bsd:*:*)
|
9000/8??:4.3bsd:*:*)
|
||||||
echo hppa1.0-hp-bsd
|
echo hppa1.0-hp-bsd
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
|
*9??*:MPE*:*:*)
|
||||||
|
echo hppa1.0-hp-mpeix
|
||||||
|
exit 0 ;;
|
||||||
|
*9??*:MPE*:*:*)
|
||||||
|
echo hppa1.0-hp-mpeix
|
||||||
|
exit 0 ;;
|
||||||
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
|
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
|
||||||
echo hppa1.1-hp-osf
|
echo hppa1.1-hp-osf
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
@ -490,6 +502,9 @@ EOF
|
|||||||
CRAY*TS:*:*:*)
|
CRAY*TS:*:*:*)
|
||||||
echo t90-cray-unicos${UNAME_RELEASE}
|
echo t90-cray-unicos${UNAME_RELEASE}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
|
CRAY*T3E:*:*:*)
|
||||||
|
echo t3e-cray-unicosmk${UNAME_RELEASE}
|
||||||
|
exit 0 ;;
|
||||||
CRAY-2:*:*:*)
|
CRAY-2:*:*:*)
|
||||||
echo cray2-cray-unicos
|
echo cray2-cray-unicos
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
@ -510,10 +525,19 @@ EOF
|
|||||||
sparc*:BSD/OS:*:*)
|
sparc*:BSD/OS:*:*)
|
||||||
echo sparc-unknown-bsdi${UNAME_RELEASE}
|
echo sparc-unknown-bsdi${UNAME_RELEASE}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
i?86:BSD/386:*:* | *:BSD/OS:*:*)
|
i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
|
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
|
*:BSD/OS:*:*)
|
||||||
|
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||||
|
exit 0 ;;
|
||||||
*:FreeBSD:*:*)
|
*:FreeBSD:*:*)
|
||||||
|
if test -x /usr/bin/objformat; then
|
||||||
|
if test "elf" = "`/usr/bin/objformat`"; then
|
||||||
|
echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
*:NetBSD:*:*)
|
*:NetBSD:*:*)
|
||||||
@ -523,13 +547,13 @@ EOF
|
|||||||
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
i*:CYGWIN*:*)
|
i*:CYGWIN*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-cygwin32
|
echo ${UNAME_MACHINE}-pc-cygwin
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
i*:MINGW*:*)
|
i*:MINGW*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-mingw32
|
echo ${UNAME_MACHINE}-pc-mingw32
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
p*:CYGWIN*:*)
|
p*:CYGWIN*:*)
|
||||||
echo powerpcle-unknown-cygwin32
|
echo powerpcle-unknown-cygwin
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
prep*:SunOS:5.*:*)
|
prep*:SunOS:5.*:*)
|
||||||
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||||
@ -541,6 +565,7 @@ EOF
|
|||||||
# uname on the ARM produces all sorts of strangeness, and we need to
|
# uname on the ARM produces all sorts of strangeness, and we need to
|
||||||
# filter it out.
|
# filter it out.
|
||||||
case "$UNAME_MACHINE" in
|
case "$UNAME_MACHINE" in
|
||||||
|
armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
|
||||||
arm* | sa110*) UNAME_MACHINE="arm" ;;
|
arm* | sa110*) UNAME_MACHINE="arm" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -563,7 +588,7 @@ EOF
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
if test "${UNAME_MACHINE}" = "alpha" ; then
|
if test "${UNAME_MACHINE}" = "alpha" ; then
|
||||||
sed 's/^ //' <<EOF >dummy.s
|
sed 's/^ //' <<EOF >$dummy.s
|
||||||
.globl main
|
.globl main
|
||||||
.ent main
|
.ent main
|
||||||
main:
|
main:
|
||||||
@ -581,9 +606,9 @@ EOF
|
|||||||
.end main
|
.end main
|
||||||
EOF
|
EOF
|
||||||
LIBC=""
|
LIBC=""
|
||||||
${CC-cc} dummy.s -o dummy 2>/dev/null
|
${CC-cc} $dummy.s -o $dummy 2>/dev/null
|
||||||
if test "$?" = 0 ; then
|
if test "$?" = 0 ; then
|
||||||
./dummy
|
./$dummy
|
||||||
case "$?" in
|
case "$?" in
|
||||||
7)
|
7)
|
||||||
UNAME_MACHINE="alpha"
|
UNAME_MACHINE="alpha"
|
||||||
@ -600,22 +625,23 @@ EOF
|
|||||||
16)
|
16)
|
||||||
UNAME_MACHINE="alphaev6"
|
UNAME_MACHINE="alphaev6"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
objdump --private-headers dummy | \
|
objdump --private-headers $dummy | \
|
||||||
grep ld.so.1 > /dev/null
|
grep ld.so.1 > /dev/null
|
||||||
if test "$?" = 0 ; then
|
if test "$?" = 0 ; then
|
||||||
LIBC="libc1"
|
LIBC="libc1"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
rm -f dummy.s dummy
|
rm -f $dummy.s $dummy
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
|
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
|
||||||
elif test "${UNAME_MACHINE}" = "mips" ; then
|
elif test "${UNAME_MACHINE}" = "mips" ; then
|
||||||
cat >dummy.c <<EOF
|
cat >$dummy.c <<EOF
|
||||||
main(argc, argv)
|
#ifdef __cplusplus
|
||||||
int argc;
|
int main (int argc, char *argv[]) {
|
||||||
char *argv[];
|
#else
|
||||||
{
|
int main (argc, argv) int argc; char *argv[]; {
|
||||||
|
#endif
|
||||||
#ifdef __MIPSEB__
|
#ifdef __MIPSEB__
|
||||||
printf ("%s-unknown-linux-gnu\n", argv[1]);
|
printf ("%s-unknown-linux-gnu\n", argv[1]);
|
||||||
#endif
|
#endif
|
||||||
@ -625,8 +651,8 @@ main(argc, argv)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
|
${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
|
||||||
rm -f dummy.c dummy
|
rm -f $dummy.c $dummy
|
||||||
else
|
else
|
||||||
# Either a pre-BFD a.out linker (linux-gnuoldld)
|
# Either a pre-BFD a.out linker (linux-gnuoldld)
|
||||||
# or one that does not give us useful --help.
|
# or one that does not give us useful --help.
|
||||||
@ -645,12 +671,13 @@ EOF
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
# Determine whether the default compiler is a.out or elf
|
# Determine whether the default compiler is a.out or elf
|
||||||
cat >dummy.c <<EOF
|
cat >$dummy.c <<EOF
|
||||||
#include <features.h>
|
#include <features.h>
|
||||||
main(argc, argv)
|
#ifdef __cplusplus
|
||||||
int argc;
|
int main (int argc, char *argv[]) {
|
||||||
char *argv[];
|
#else
|
||||||
{
|
int main (argc, argv) int argc; char *argv[]; {
|
||||||
|
#endif
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
# ifdef __GLIBC__
|
# ifdef __GLIBC__
|
||||||
# if __GLIBC__ >= 2
|
# if __GLIBC__ >= 2
|
||||||
@ -667,8 +694,8 @@ main(argc, argv)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
|
${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
|
||||||
rm -f dummy.c dummy
|
rm -f $dummy.c $dummy
|
||||||
fi ;;
|
fi ;;
|
||||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
|
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
|
||||||
# are messed up and put the nodename in both sysname and nodename.
|
# are messed up and put the nodename in both sysname and nodename.
|
||||||
@ -752,7 +779,7 @@ EOF
|
|||||||
mc68030:UNIX_System_V:4.*:*)
|
mc68030:UNIX_System_V:4.*:*)
|
||||||
echo m68k-atari-sysv4
|
echo m68k-atari-sysv4
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
i?86:LynxOS:2.*:*)
|
i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
|
||||||
echo i386-unknown-lynxos${UNAME_RELEASE}
|
echo i386-unknown-lynxos${UNAME_RELEASE}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
TSUNAMI:LynxOS:2.*:*)
|
TSUNAMI:LynxOS:2.*:*)
|
||||||
@ -764,6 +791,9 @@ EOF
|
|||||||
SM[BE]S:UNIX_SV:*:*)
|
SM[BE]S:UNIX_SV:*:*)
|
||||||
echo mips-dde-sysv${UNAME_RELEASE}
|
echo mips-dde-sysv${UNAME_RELEASE}
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
|
RM*:ReliantUNIX-*:*:*)
|
||||||
|
echo mips-sni-sysv4
|
||||||
|
exit 0 ;;
|
||||||
RM*:SINIX-*:*:*)
|
RM*:SINIX-*:*:*)
|
||||||
echo mips-sni-sysv4
|
echo mips-sni-sysv4
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
@ -794,7 +824,7 @@ EOF
|
|||||||
news*:NEWS-OS:*:6*)
|
news*:NEWS-OS:*:6*)
|
||||||
echo mips-sony-newsos6
|
echo mips-sony-newsos6
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
|
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
|
||||||
if [ -d /usr/nec ]; then
|
if [ -d /usr/nec ]; then
|
||||||
echo mips-nec-sysv${UNAME_RELEASE}
|
echo mips-nec-sysv${UNAME_RELEASE}
|
||||||
else
|
else
|
||||||
@ -810,12 +840,24 @@ EOF
|
|||||||
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
||||||
echo i586-pc-beos
|
echo i586-pc-beos
|
||||||
exit 0 ;;
|
exit 0 ;;
|
||||||
|
SX-4:SUPER-UX:*:*)
|
||||||
|
echo sx4-nec-superux${UNAME_RELEASE}
|
||||||
|
exit 0 ;;
|
||||||
|
SX-5:SUPER-UX:*:*)
|
||||||
|
echo sx5-nec-superux${UNAME_RELEASE}
|
||||||
|
exit 0 ;;
|
||||||
|
Power*:Rhapsody:*:*)
|
||||||
|
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||||
|
exit 0 ;;
|
||||||
|
*:Rhapsody:*:*)
|
||||||
|
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
|
||||||
|
exit 0 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||||
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
|
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
|
||||||
|
|
||||||
cat >dummy.c <<EOF
|
cat >$dummy.c <<EOF
|
||||||
#ifdef _SEQUENT_
|
#ifdef _SEQUENT_
|
||||||
# include <sys/types.h>
|
# include <sys/types.h>
|
||||||
# include <sys/utsname.h>
|
# include <sys/utsname.h>
|
||||||
@ -853,7 +895,10 @@ main ()
|
|||||||
#endif
|
#endif
|
||||||
int version;
|
int version;
|
||||||
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
|
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
|
||||||
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
|
if (version < 4)
|
||||||
|
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
|
||||||
|
else
|
||||||
|
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
|
||||||
exit (0);
|
exit (0);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -913,8 +958,8 @@ main ()
|
|||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
|
${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
|
||||||
rm -f dummy.c dummy
|
rm -f $dummy.c $dummy
|
||||||
|
|
||||||
# Apollos put the system type in the environment.
|
# Apollos put the system type in the environment.
|
||||||
|
|
||||||
|
30
config.sub
vendored
30
config.sub
vendored
@ -152,6 +152,7 @@ case $basic_machine in
|
|||||||
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
|
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
|
||||||
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
|
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
|
||||||
| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
|
| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
|
||||||
|
| hppa2.0w \
|
||||||
| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
|
| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
|
||||||
| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
|
| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
|
||||||
| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
|
| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
|
||||||
@ -176,13 +177,14 @@ case $basic_machine in
|
|||||||
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
|
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
|
||||||
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
|
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
|
||||||
| xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
|
| xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
|
||||||
|
| hppa2.0w-* \
|
||||||
| alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
|
| alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
|
||||||
| ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
|
| ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
|
||||||
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
|
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
|
||||||
| sparc64-* | mips64-* | mipsel-* \
|
| sparc64-* | mips64-* | mipsel-* \
|
||||||
| mips64el-* | mips64orion-* | mips64orionel-* \
|
| mips64el-* | mips64orion-* | mips64orionel-* \
|
||||||
| mipstx39-* | mipstx39el-* \
|
| mipstx39-* | mipstx39el-* \
|
||||||
| f301-*)
|
| f301-* | armv*-*)
|
||||||
;;
|
;;
|
||||||
# Recognize the various machine names and aliases which stand
|
# Recognize the various machine names and aliases which stand
|
||||||
# for a CPU type and a company and sometimes even an OS.
|
# for a CPU type and a company and sometimes even an OS.
|
||||||
@ -345,6 +347,14 @@ case $basic_machine in
|
|||||||
hppa-next)
|
hppa-next)
|
||||||
os=-nextstep3
|
os=-nextstep3
|
||||||
;;
|
;;
|
||||||
|
hp3k9[0-9][0-9] | hp9[0-9][0-9])
|
||||||
|
basic_machine=hppa1.0-hp
|
||||||
|
os=-mpeix
|
||||||
|
;;
|
||||||
|
hp3k9[0-9][0-9] | hp9[0-9][0-9])
|
||||||
|
basic_machine=hppa1.0-hp
|
||||||
|
os=-mpeix
|
||||||
|
;;
|
||||||
i370-ibm* | ibm*)
|
i370-ibm* | ibm*)
|
||||||
basic_machine=i370-ibm
|
basic_machine=i370-ibm
|
||||||
os=-mvs
|
os=-mvs
|
||||||
@ -412,6 +422,10 @@ case $basic_machine in
|
|||||||
basic_machine=i486-ncr
|
basic_machine=i486-ncr
|
||||||
os=-sysv4
|
os=-sysv4
|
||||||
;;
|
;;
|
||||||
|
netwinder)
|
||||||
|
basic_machine=armv4l-corel
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
news | news700 | news800 | news900)
|
news | news700 | news800 | news900)
|
||||||
basic_machine=m68k-sony
|
basic_machine=m68k-sony
|
||||||
os=-newsos
|
os=-newsos
|
||||||
@ -713,8 +727,9 @@ case $os in
|
|||||||
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
|
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
|
||||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||||
| -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||||
| -mingw32* | -linux-gnu* | -uxpv* | -beos*)
|
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
|
||||||
|
| -openstep* | -mpeix* | -oskit*)
|
||||||
# Remember, each alternative MUST END IN *, to match a version number.
|
# Remember, each alternative MUST END IN *, to match a version number.
|
||||||
;;
|
;;
|
||||||
-linux*)
|
-linux*)
|
||||||
@ -800,6 +815,9 @@ case $basic_machine in
|
|||||||
*-acorn)
|
*-acorn)
|
||||||
os=-riscix1.2
|
os=-riscix1.2
|
||||||
;;
|
;;
|
||||||
|
arm*-corel)
|
||||||
|
os=-linux
|
||||||
|
;;
|
||||||
arm*-semi)
|
arm*-semi)
|
||||||
os=-aout
|
os=-aout
|
||||||
;;
|
;;
|
||||||
@ -920,6 +938,12 @@ case $basic_machine in
|
|||||||
-hpux*)
|
-hpux*)
|
||||||
vendor=hp
|
vendor=hp
|
||||||
;;
|
;;
|
||||||
|
-mpeix*)
|
||||||
|
vendor=hp
|
||||||
|
;;
|
||||||
|
-mpeix*)
|
||||||
|
vendor=hp
|
||||||
|
;;
|
||||||
-hiux*)
|
-hiux*)
|
||||||
vendor=hitachi
|
vendor=hitachi
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user