* Makefile.in: Add with_cross_host to allow more granular checks.
Set installation directories accordingly. Override CC setting only if building a Cygwin target. * aclocal.m4: Regenerate. * configure.in: Move AC_CANONICAL_SYSTEM check up. Add GCC_NO_EXECUTABLES. Substitute with_cross_host in depending files. Test AC_ALLOCA only if building on a native system. * configure: Regenerate.
This commit is contained in:
Corinna Vinschen
@@ -1,3 +1,14 @@
|
|||||||
|
2006-08-30 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
|
* Makefile.in: Add with_cross_host to allow more granular checks.
|
||||||
|
Set installation directories accordingly. Override CC setting only
|
||||||
|
if building a Cygwin target.
|
||||||
|
* aclocal.m4: Regenerate.
|
||||||
|
* configure.in: Move AC_CANONICAL_SYSTEM check up. Add
|
||||||
|
GCC_NO_EXECUTABLES. Substitute with_cross_host in depending files.
|
||||||
|
Test AC_ALLOCA only if building on a native system.
|
||||||
|
* configure: Regenerate.
|
||||||
|
|
||||||
2006-08-27 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
|
2006-08-27 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
|
||||||
|
|
||||||
* include/ctype.h: Fix typo.
|
* include/ctype.h: Fix typo.
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ objdir = .
|
|||||||
host_alias = @host_alias@
|
host_alias = @host_alias@
|
||||||
build_alias = @build_alias@
|
build_alias = @build_alias@
|
||||||
target_alias = @target_alias@
|
target_alias = @target_alias@
|
||||||
|
with_cross_host = @with_cross_host@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
conf_prefix = @prefix@
|
conf_prefix = @prefix@
|
||||||
|
|
||||||
@@ -53,11 +54,18 @@ inst_includedir:=$(tooldir)/include/mingw
|
|||||||
inst_libdir:=$(tooldir)/lib/mingw
|
inst_libdir:=$(tooldir)/lib/mingw
|
||||||
inst_docdir:=$(tooldir)/share/doc/mingw-runtime
|
inst_docdir:=$(tooldir)/share/doc/mingw-runtime
|
||||||
else
|
else
|
||||||
|
ifneq (,$with_cross_host)
|
||||||
|
inst_bindir:=$(tooldir)/bin
|
||||||
|
inst_includedir:=$(tooldir)/include
|
||||||
|
inst_libdir:=$(tooldir)/lib
|
||||||
|
inst_docdir:=$(tooldir)/share/doc/mingw-runtime
|
||||||
|
else
|
||||||
inst_bindir:=$(bindir)
|
inst_bindir:=$(bindir)
|
||||||
inst_includedir:=$(includedir)
|
inst_includedir:=$(includedir)
|
||||||
inst_libdir:=$(libdir)
|
inst_libdir:=$(libdir)
|
||||||
inst_docdir:=$(prefix)/doc/mingw-runtime
|
inst_docdir:=$(prefix)/doc/mingw-runtime
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
# The Mingw headers are installed under a subdirectory of
|
# The Mingw headers are installed under a subdirectory of
|
||||||
# $(tooldir)/include when configuring in Cygwin.
|
# $(tooldir)/include when configuring in Cygwin.
|
||||||
@@ -71,7 +79,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||||||
mkinstalldirs = $(SHELL) @MKINSTALLDIRS@
|
mkinstalldirs = $(SHELL) @MKINSTALLDIRS@
|
||||||
|
|
||||||
CC := @CC@
|
CC := @CC@
|
||||||
|
ifneq (,$(findstring cygwin,$(target_alias)))
|
||||||
override CC := ${filter-out -L% -B%,${shell echo $(CC) | sed -e 's%\(-isystem\|-iwithprefixbefore\) *[^ ]*\( \|$$\)% %g'}}
|
override CC := ${filter-out -L% -B%,${shell echo $(CC) | sed -e 's%\(-isystem\|-iwithprefixbefore\) *[^ ]*\( \|$$\)% %g'}}
|
||||||
|
endif
|
||||||
# FIXME: Which is it, CC or CC_FOR_TARGET?
|
# FIXME: Which is it, CC or CC_FOR_TARGET?
|
||||||
CC_FOR_TARGET = $(CC)
|
CC_FOR_TARGET = $(CC)
|
||||||
AS_FOR_TARGET = $(AS)
|
AS_FOR_TARGET = $(AS)
|
||||||
|
|||||||
882
winsup/mingw/aclocal.m4
vendored
882
winsup/mingw/aclocal.m4
vendored
@@ -1,833 +1,77 @@
|
|||||||
dnl aclocal.m4 generated automatically by aclocal 1.4-p6
|
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
||||||
|
|
||||||
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||||
dnl This file is free software; the Free Software Foundation
|
# 2005 Free Software Foundation, Inc.
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
# This file is free software; the Free Software Foundation
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
dnl This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||||
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
dnl PARTICULAR PURPOSE.
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
# lib-prefix.m4 serial 4 (gettext-0.14.2)
|
# GCC_NO_EXECUTABLES
|
||||||
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
|
# -----------------
|
||||||
dnl This file is free software; the Free Software Foundation
|
# FIXME: The GCC team has specific needs which the current Autoconf
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
# framework cannot solve elegantly. This macro implements a dirty
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
# hack until Autoconf is able to provide the services its users
|
||||||
|
# need.
|
||||||
|
#
|
||||||
|
# Several of the support libraries that are often built with GCC can't
|
||||||
|
# assume the tool-chain is already capable of linking a program: the
|
||||||
|
# compiler often expects to be able to link with some of such
|
||||||
|
# libraries.
|
||||||
|
#
|
||||||
|
# In several of these libraries, workarounds have been introduced to
|
||||||
|
# avoid the AC_PROG_CC_WORKS test, that would just abort their
|
||||||
|
# configuration. The introduction of AC_EXEEXT, enabled either by
|
||||||
|
# libtool or by CVS autoconf, have just made matters worse.
|
||||||
|
#
|
||||||
|
# Unlike the previous AC_NO_EXECUTABLES, this test does not
|
||||||
|
# disable link tests at autoconf time, but at configure time.
|
||||||
|
# This allows AC_NO_EXECUTABLES to be invoked conditionally.
|
||||||
|
AC_DEFUN_ONCE([GCC_NO_EXECUTABLES],
|
||||||
|
[m4_divert_push([KILL])
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
AC_BEFORE([$0], [_AC_COMPILER_EXEEXT])
|
||||||
|
AC_BEFORE([$0], [AC_LINK_IFELSE])
|
||||||
|
|
||||||
dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
|
m4_define([_AC_COMPILER_EXEEXT],
|
||||||
dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
|
AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
|
||||||
dnl require excessive bracketing.
|
# FIXME: Cleanup?
|
||||||
ifdef([AC_HELP_STRING],
|
AS_IF([AC_TRY_EVAL(ac_link)], [gcc_no_link=no], [gcc_no_link=yes])
|
||||||
[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
|
if test x$gcc_no_link = xyes; then
|
||||||
[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
|
# Setting cross_compile will disable run tests; it will
|
||||||
|
# also disable AC_CHECK_FILE but that's generally
|
||||||
|
# correct if we can't link.
|
||||||
|
cross_compiling=yes
|
||||||
|
EXEEXT=
|
||||||
|
else
|
||||||
|
m4_defn([_AC_COMPILER_EXEEXT])dnl
|
||||||
|
fi
|
||||||
|
)
|
||||||
|
|
||||||
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
|
m4_define([AC_LINK_IFELSE],
|
||||||
dnl to access previously installed libraries. The basic assumption is that
|
if test x$gcc_no_link = xyes; then
|
||||||
dnl a user will want packages to use other packages he previously installed
|
AC_MSG_ERROR([Link tests are not allowed after [[$0]].])
|
||||||
dnl with the same --prefix option.
|
|
||||||
dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
|
|
||||||
dnl libraries, but is otherwise very convenient.
|
|
||||||
AC_DEFUN([AC_LIB_PREFIX],
|
|
||||||
[
|
|
||||||
AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
|
|
||||||
AC_REQUIRE([AC_PROG_CC])
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
||||||
dnl By default, look in $includedir and $libdir.
|
|
||||||
use_additional=yes
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([
|
|
||||||
eval additional_includedir=\"$includedir\"
|
|
||||||
eval additional_libdir=\"$libdir\"
|
|
||||||
])
|
|
||||||
AC_LIB_ARG_WITH([lib-prefix],
|
|
||||||
[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
|
|
||||||
--without-lib-prefix don't search for libraries in includedir and libdir],
|
|
||||||
[
|
|
||||||
if test "X$withval" = "Xno"; then
|
|
||||||
use_additional=no
|
|
||||||
else
|
|
||||||
if test "X$withval" = "X"; then
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([
|
|
||||||
eval additional_includedir=\"$includedir\"
|
|
||||||
eval additional_libdir=\"$libdir\"
|
|
||||||
])
|
|
||||||
else
|
|
||||||
additional_includedir="$withval/include"
|
|
||||||
additional_libdir="$withval/lib"
|
|
||||||
fi
|
fi
|
||||||
fi
|
m4_defn([AC_LINK_IFELSE]))
|
||||||
])
|
|
||||||
if test $use_additional = yes; then
|
|
||||||
dnl Potentially add $additional_includedir to $CPPFLAGS.
|
|
||||||
dnl But don't add it
|
|
||||||
dnl 1. if it's the standard /usr/include,
|
|
||||||
dnl 2. if it's already present in $CPPFLAGS,
|
|
||||||
dnl 3. if it's /usr/local/include and we are using GCC on Linux,
|
|
||||||
dnl 4. if it doesn't exist as a directory.
|
|
||||||
if test "X$additional_includedir" != "X/usr/include"; then
|
|
||||||
haveit=
|
|
||||||
for x in $CPPFLAGS; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-I$additional_includedir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
||||||
if test -n "$GCC"; then
|
|
||||||
case $host_os in
|
|
||||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_includedir"; then
|
|
||||||
dnl Really add $additional_includedir to $CPPFLAGS.
|
|
||||||
CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
dnl Potentially add $additional_libdir to $LDFLAGS.
|
|
||||||
dnl But don't add it
|
|
||||||
dnl 1. if it's the standard /usr/lib,
|
|
||||||
dnl 2. if it's already present in $LDFLAGS,
|
|
||||||
dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
|
|
||||||
dnl 4. if it doesn't exist as a directory.
|
|
||||||
if test "X$additional_libdir" != "X/usr/lib"; then
|
|
||||||
haveit=
|
|
||||||
for x in $LDFLAGS; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-L$additional_libdir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
||||||
if test -n "$GCC"; then
|
|
||||||
case $host_os in
|
|
||||||
linux*) haveit=yes;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_libdir"; then
|
|
||||||
dnl Really add $additional_libdir to $LDFLAGS.
|
|
||||||
LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
|
dnl This is a shame. We have to provide a default for some link tests,
|
||||||
dnl acl_final_exec_prefix, containing the values to which $prefix and
|
dnl similar to the default for run tests.
|
||||||
dnl $exec_prefix will expand at the end of the configure script.
|
m4_define([AC_FUNC_MMAP],
|
||||||
AC_DEFUN([AC_LIB_PREPARE_PREFIX],
|
if test x$gcc_no_link = xyes; then
|
||||||
[
|
if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then
|
||||||
dnl Unfortunately, prefix and exec_prefix get only finally determined
|
ac_cv_func_mmap_fixed_mapped=no
|
||||||
dnl at the end of configure.
|
|
||||||
if test "X$prefix" = "XNONE"; then
|
|
||||||
acl_final_prefix="$ac_default_prefix"
|
|
||||||
else
|
|
||||||
acl_final_prefix="$prefix"
|
|
||||||
fi
|
fi
|
||||||
if test "X$exec_prefix" = "XNONE"; then
|
|
||||||
acl_final_exec_prefix='${prefix}'
|
|
||||||
else
|
|
||||||
acl_final_exec_prefix="$exec_prefix"
|
|
||||||
fi
|
fi
|
||||||
acl_save_prefix="$prefix"
|
if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then
|
||||||
prefix="$acl_final_prefix"
|
m4_defn([AC_FUNC_MMAP])
|
||||||
eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
|
fi)
|
||||||
prefix="$acl_save_prefix"
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
|
m4_divert_pop()dnl
|
||||||
dnl variables prefix and exec_prefix bound to the values they will have
|
])# GCC_NO_EXECUTABLES
|
||||||
dnl at the end of the configure script.
|
|
||||||
AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
|
|
||||||
[
|
|
||||||
acl_save_prefix="$prefix"
|
|
||||||
prefix="$acl_final_prefix"
|
|
||||||
acl_save_exec_prefix="$exec_prefix"
|
|
||||||
exec_prefix="$acl_final_exec_prefix"
|
|
||||||
$1
|
|
||||||
exec_prefix="$acl_save_exec_prefix"
|
|
||||||
prefix="$acl_save_prefix"
|
|
||||||
])
|
|
||||||
|
|
||||||
# lib-link.m4 serial 6 (gettext-0.14.3)
|
|
||||||
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software; the Free Software Foundation
|
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
|
||||||
|
|
||||||
AC_PREREQ(2.50)
|
|
||||||
|
|
||||||
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
|
||||||
dnl the libraries corresponding to explicit and implicit dependencies.
|
|
||||||
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
|
|
||||||
dnl augments the CPPFLAGS variable.
|
|
||||||
AC_DEFUN([AC_LIB_LINKFLAGS],
|
|
||||||
[
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
||||||
AC_REQUIRE([AC_LIB_RPATH])
|
|
||||||
define([Name],[translit([$1],[./-], [___])])
|
|
||||||
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
||||||
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
|
|
||||||
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
|
||||||
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
|
|
||||||
ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
|
|
||||||
ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
|
|
||||||
])
|
|
||||||
LIB[]NAME="$ac_cv_lib[]Name[]_libs"
|
|
||||||
LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
|
|
||||||
INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
|
|
||||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
|
||||||
AC_SUBST([LIB]NAME)
|
|
||||||
AC_SUBST([LTLIB]NAME)
|
|
||||||
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
|
|
||||||
dnl results of this search when this library appears as a dependency.
|
|
||||||
HAVE_LIB[]NAME=yes
|
|
||||||
undefine([Name])
|
|
||||||
undefine([NAME])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
|
|
||||||
dnl searches for libname and the libraries corresponding to explicit and
|
|
||||||
dnl implicit dependencies, together with the specified include files and
|
|
||||||
dnl the ability to compile and link the specified testcode. If found, it
|
|
||||||
dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
|
|
||||||
dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
|
|
||||||
dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
|
|
||||||
dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
|
|
||||||
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
|
||||||
[
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
||||||
AC_REQUIRE([AC_LIB_RPATH])
|
|
||||||
define([Name],[translit([$1],[./-], [___])])
|
|
||||||
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
||||||
|
|
||||||
dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
|
|
||||||
dnl accordingly.
|
|
||||||
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
|
||||||
|
|
||||||
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
|
|
||||||
dnl because if the user has installed lib[]Name and not disabled its use
|
|
||||||
dnl via --without-lib[]Name-prefix, he wants to use it.
|
|
||||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
|
||||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
|
||||||
|
|
||||||
AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS $LIB[]NAME"
|
|
||||||
AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
])
|
|
||||||
if test "$ac_cv_lib[]Name" = yes; then
|
|
||||||
HAVE_LIB[]NAME=yes
|
|
||||||
AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
|
|
||||||
AC_MSG_CHECKING([how to link with lib[]$1])
|
|
||||||
AC_MSG_RESULT([$LIB[]NAME])
|
|
||||||
else
|
|
||||||
HAVE_LIB[]NAME=no
|
|
||||||
dnl If $LIB[]NAME didn't lead to a usable library, we don't need
|
|
||||||
dnl $INC[]NAME either.
|
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
|
||||||
LIB[]NAME=
|
|
||||||
LTLIB[]NAME=
|
|
||||||
fi
|
|
||||||
AC_SUBST([HAVE_LIB]NAME)
|
|
||||||
AC_SUBST([LIB]NAME)
|
|
||||||
AC_SUBST([LTLIB]NAME)
|
|
||||||
undefine([Name])
|
|
||||||
undefine([NAME])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl Determine the platform dependent parameters needed to use rpath:
|
|
||||||
dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
|
|
||||||
dnl hardcode_direct, hardcode_minus_L.
|
|
||||||
AC_DEFUN([AC_LIB_RPATH],
|
|
||||||
[
|
|
||||||
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
|
|
||||||
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
|
|
||||||
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
|
||||||
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
|
||||||
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
|
|
||||||
AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
|
|
||||||
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
|
||||||
${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
|
|
||||||
. ./conftest.sh
|
|
||||||
rm -f ./conftest.sh
|
|
||||||
acl_cv_rpath=done
|
|
||||||
])
|
|
||||||
wl="$acl_cv_wl"
|
|
||||||
libext="$acl_cv_libext"
|
|
||||||
shlibext="$acl_cv_shlibext"
|
|
||||||
hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
|
||||||
hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
|
||||||
hardcode_direct="$acl_cv_hardcode_direct"
|
|
||||||
hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
|
||||||
dnl Determine whether the user wants rpath handling at all.
|
|
||||||
AC_ARG_ENABLE(rpath,
|
|
||||||
[ --disable-rpath do not hardcode runtime library paths],
|
|
||||||
:, enable_rpath=yes)
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
|
|
||||||
dnl the libraries corresponding to explicit and implicit dependencies.
|
|
||||||
dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
|
|
||||||
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
||||||
[
|
|
||||||
define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
|
||||||
dnl By default, look in $includedir and $libdir.
|
|
||||||
use_additional=yes
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([
|
|
||||||
eval additional_includedir=\"$includedir\"
|
|
||||||
eval additional_libdir=\"$libdir\"
|
|
||||||
])
|
|
||||||
AC_LIB_ARG_WITH([lib$1-prefix],
|
|
||||||
[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
|
|
||||||
--without-lib$1-prefix don't search for lib$1 in includedir and libdir],
|
|
||||||
[
|
|
||||||
if test "X$withval" = "Xno"; then
|
|
||||||
use_additional=no
|
|
||||||
else
|
|
||||||
if test "X$withval" = "X"; then
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([
|
|
||||||
eval additional_includedir=\"$includedir\"
|
|
||||||
eval additional_libdir=\"$libdir\"
|
|
||||||
])
|
|
||||||
else
|
|
||||||
additional_includedir="$withval/include"
|
|
||||||
additional_libdir="$withval/lib"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
dnl Search the library and its dependencies in $additional_libdir and
|
|
||||||
dnl $LDFLAGS. Using breadth-first-seach.
|
|
||||||
LIB[]NAME=
|
|
||||||
LTLIB[]NAME=
|
|
||||||
INC[]NAME=
|
|
||||||
rpathdirs=
|
|
||||||
ltrpathdirs=
|
|
||||||
names_already_handled=
|
|
||||||
names_next_round='$1 $2'
|
|
||||||
while test -n "$names_next_round"; do
|
|
||||||
names_this_round="$names_next_round"
|
|
||||||
names_next_round=
|
|
||||||
for name in $names_this_round; do
|
|
||||||
already_handled=
|
|
||||||
for n in $names_already_handled; do
|
|
||||||
if test "$n" = "$name"; then
|
|
||||||
already_handled=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$already_handled"; then
|
|
||||||
names_already_handled="$names_already_handled $name"
|
|
||||||
dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
|
|
||||||
dnl or AC_LIB_HAVE_LINKFLAGS call.
|
|
||||||
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
|
|
||||||
eval value=\"\$HAVE_LIB$uppername\"
|
|
||||||
if test -n "$value"; then
|
|
||||||
if test "$value" = yes; then
|
|
||||||
eval value=\"\$LIB$uppername\"
|
|
||||||
test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
|
|
||||||
eval value=\"\$LTLIB$uppername\"
|
|
||||||
test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
|
|
||||||
else
|
|
||||||
dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
|
|
||||||
dnl that this library doesn't exist. So just drop it.
|
|
||||||
:
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
dnl Search the library lib$name in $additional_libdir and $LDFLAGS
|
|
||||||
dnl and the already constructed $LIBNAME/$LTLIBNAME.
|
|
||||||
found_dir=
|
|
||||||
found_la=
|
|
||||||
found_so=
|
|
||||||
found_a=
|
|
||||||
if test $use_additional = yes; then
|
|
||||||
if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
|
|
||||||
found_dir="$additional_libdir"
|
|
||||||
found_so="$additional_libdir/lib$name.$shlibext"
|
|
||||||
if test -f "$additional_libdir/lib$name.la"; then
|
|
||||||
found_la="$additional_libdir/lib$name.la"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if test -f "$additional_libdir/lib$name.$libext"; then
|
|
||||||
found_dir="$additional_libdir"
|
|
||||||
found_a="$additional_libdir/lib$name.$libext"
|
|
||||||
if test -f "$additional_libdir/lib$name.la"; then
|
|
||||||
found_la="$additional_libdir/lib$name.la"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "X$found_dir" = "X"; then
|
|
||||||
for x in $LDFLAGS $LTLIB[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
case "$x" in
|
|
||||||
-L*)
|
|
||||||
dir=`echo "X$x" | sed -e 's/^X-L//'`
|
|
||||||
if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_so="$dir/lib$name.$shlibext"
|
|
||||||
if test -f "$dir/lib$name.la"; then
|
|
||||||
found_la="$dir/lib$name.la"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if test -f "$dir/lib$name.$libext"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_a="$dir/lib$name.$libext"
|
|
||||||
if test -f "$dir/lib$name.la"; then
|
|
||||||
found_la="$dir/lib$name.la"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if test "X$found_dir" != "X"; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
if test "X$found_dir" != "X"; then
|
|
||||||
dnl Found the library.
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
|
|
||||||
if test "X$found_so" != "X"; then
|
|
||||||
dnl Linking with a shared library. We attempt to hardcode its
|
|
||||||
dnl directory into the executable's runpath, unless it's the
|
|
||||||
dnl standard /usr/lib.
|
|
||||||
if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
|
|
||||||
dnl No hardcoding is needed.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
||||||
else
|
|
||||||
dnl Use an explicit option to hardcode DIR into the resulting
|
|
||||||
dnl binary.
|
|
||||||
dnl Potentially add DIR to ltrpathdirs.
|
|
||||||
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
|
||||||
haveit=
|
|
||||||
for x in $ltrpathdirs; do
|
|
||||||
if test "X$x" = "X$found_dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
ltrpathdirs="$ltrpathdirs $found_dir"
|
|
||||||
fi
|
|
||||||
dnl The hardcoding into $LIBNAME is system dependent.
|
|
||||||
if test "$hardcode_direct" = yes; then
|
|
||||||
dnl Using DIR/libNAME.so during linking hardcodes DIR into the
|
|
||||||
dnl resulting binary.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
||||||
else
|
|
||||||
if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
|
|
||||||
dnl Use an explicit option to hardcode DIR into the resulting
|
|
||||||
dnl binary.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
||||||
dnl Potentially add DIR to rpathdirs.
|
|
||||||
dnl The rpathdirs will be appended to $LIBNAME at the end.
|
|
||||||
haveit=
|
|
||||||
for x in $rpathdirs; do
|
|
||||||
if test "X$x" = "X$found_dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
rpathdirs="$rpathdirs $found_dir"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
dnl Rely on "-L$found_dir".
|
|
||||||
dnl But don't add it if it's already contained in the LDFLAGS
|
|
||||||
dnl or the already constructed $LIBNAME
|
|
||||||
haveit=
|
|
||||||
for x in $LDFLAGS $LIB[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-L$found_dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
|
|
||||||
fi
|
|
||||||
if test "$hardcode_minus_L" != no; then
|
|
||||||
dnl FIXME: Not sure whether we should use
|
|
||||||
dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
|
||||||
dnl here.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
||||||
else
|
|
||||||
dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
|
|
||||||
dnl here, because this doesn't fit in flags passed to the
|
|
||||||
dnl compiler. So give up. No hardcoding. This affects only
|
|
||||||
dnl very old systems.
|
|
||||||
dnl FIXME: Not sure whether we should use
|
|
||||||
dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
|
||||||
dnl here.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if test "X$found_a" != "X"; then
|
|
||||||
dnl Linking with a static library.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
|
|
||||||
else
|
|
||||||
dnl We shouldn't come here, but anyway it's good to have a
|
|
||||||
dnl fallback.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
dnl Assume the include files are nearby.
|
|
||||||
additional_includedir=
|
|
||||||
case "$found_dir" in
|
|
||||||
*/lib | */lib/)
|
|
||||||
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
|
|
||||||
additional_includedir="$basedir/include"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if test "X$additional_includedir" != "X"; then
|
|
||||||
dnl Potentially add $additional_includedir to $INCNAME.
|
|
||||||
dnl But don't add it
|
|
||||||
dnl 1. if it's the standard /usr/include,
|
|
||||||
dnl 2. if it's /usr/local/include and we are using GCC on Linux,
|
|
||||||
dnl 3. if it's already present in $CPPFLAGS or the already
|
|
||||||
dnl constructed $INCNAME,
|
|
||||||
dnl 4. if it doesn't exist as a directory.
|
|
||||||
if test "X$additional_includedir" != "X/usr/include"; then
|
|
||||||
haveit=
|
|
||||||
if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
||||||
if test -n "$GCC"; then
|
|
||||||
case $host_os in
|
|
||||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
for x in $CPPFLAGS $INC[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-I$additional_includedir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_includedir"; then
|
|
||||||
dnl Really add $additional_includedir to $INCNAME.
|
|
||||||
INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
dnl Look for dependencies.
|
|
||||||
if test -n "$found_la"; then
|
|
||||||
dnl Read the .la file. It defines the variables
|
|
||||||
dnl dlname, library_names, old_library, dependency_libs, current,
|
|
||||||
dnl age, revision, installed, dlopen, dlpreopen, libdir.
|
|
||||||
save_libdir="$libdir"
|
|
||||||
case "$found_la" in
|
|
||||||
*/* | *\\*) . "$found_la" ;;
|
|
||||||
*) . "./$found_la" ;;
|
|
||||||
esac
|
|
||||||
libdir="$save_libdir"
|
|
||||||
dnl We use only dependency_libs.
|
|
||||||
for dep in $dependency_libs; do
|
|
||||||
case "$dep" in
|
|
||||||
-L*)
|
|
||||||
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
|
|
||||||
dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
|
|
||||||
dnl But don't add it
|
|
||||||
dnl 1. if it's the standard /usr/lib,
|
|
||||||
dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
|
|
||||||
dnl 3. if it's already present in $LDFLAGS or the already
|
|
||||||
dnl constructed $LIBNAME,
|
|
||||||
dnl 4. if it doesn't exist as a directory.
|
|
||||||
if test "X$additional_libdir" != "X/usr/lib"; then
|
|
||||||
haveit=
|
|
||||||
if test "X$additional_libdir" = "X/usr/local/lib"; then
|
|
||||||
if test -n "$GCC"; then
|
|
||||||
case $host_os in
|
|
||||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
haveit=
|
|
||||||
for x in $LDFLAGS $LIB[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-L$additional_libdir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_libdir"; then
|
|
||||||
dnl Really add $additional_libdir to $LIBNAME.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
haveit=
|
|
||||||
for x in $LDFLAGS $LTLIB[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-L$additional_libdir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_libdir"; then
|
|
||||||
dnl Really add $additional_libdir to $LTLIBNAME.
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
-R*)
|
|
||||||
dir=`echo "X$dep" | sed -e 's/^X-R//'`
|
|
||||||
if test "$enable_rpath" != no; then
|
|
||||||
dnl Potentially add DIR to rpathdirs.
|
|
||||||
dnl The rpathdirs will be appended to $LIBNAME at the end.
|
|
||||||
haveit=
|
|
||||||
for x in $rpathdirs; do
|
|
||||||
if test "X$x" = "X$dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
rpathdirs="$rpathdirs $dir"
|
|
||||||
fi
|
|
||||||
dnl Potentially add DIR to ltrpathdirs.
|
|
||||||
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
|
||||||
haveit=
|
|
||||||
for x in $ltrpathdirs; do
|
|
||||||
if test "X$x" = "X$dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
ltrpathdirs="$ltrpathdirs $dir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
-l*)
|
|
||||||
dnl Handle this in the next round.
|
|
||||||
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
|
|
||||||
;;
|
|
||||||
*.la)
|
|
||||||
dnl Handle this in the next round. Throw away the .la's
|
|
||||||
dnl directory; it is already contained in a preceding -L
|
|
||||||
dnl option.
|
|
||||||
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
dnl Most likely an immediate library name.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
dnl Didn't find the library; assume it is in the system directories
|
|
||||||
dnl known to the linker and runtime loader. (All the system
|
|
||||||
dnl directories known to the linker should also be known to the
|
|
||||||
dnl runtime loader, otherwise the system is severely misconfigured.)
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
if test "X$rpathdirs" != "X"; then
|
|
||||||
if test -n "$hardcode_libdir_separator"; then
|
|
||||||
dnl Weird platform: only the last -rpath option counts, the user must
|
|
||||||
dnl pass all path elements in one option. We can arrange that for a
|
|
||||||
dnl single library, but not when more than one $LIBNAMEs are used.
|
|
||||||
alldirs=
|
|
||||||
for found_dir in $rpathdirs; do
|
|
||||||
alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
|
|
||||||
done
|
|
||||||
dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
|
|
||||||
acl_save_libdir="$libdir"
|
|
||||||
libdir="$alldirs"
|
|
||||||
eval flag=\"$hardcode_libdir_flag_spec\"
|
|
||||||
libdir="$acl_save_libdir"
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
|
||||||
else
|
|
||||||
dnl The -rpath options are cumulative.
|
|
||||||
for found_dir in $rpathdirs; do
|
|
||||||
acl_save_libdir="$libdir"
|
|
||||||
libdir="$found_dir"
|
|
||||||
eval flag=\"$hardcode_libdir_flag_spec\"
|
|
||||||
libdir="$acl_save_libdir"
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "X$ltrpathdirs" != "X"; then
|
|
||||||
dnl When using libtool, the option that works for both libraries and
|
|
||||||
dnl executables is -R. The -R options are cumulative.
|
|
||||||
for found_dir in $ltrpathdirs; do
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
|
|
||||||
dnl unless already present in VAR.
|
|
||||||
dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
|
|
||||||
dnl contains two or three consecutive elements that belong together.
|
|
||||||
AC_DEFUN([AC_LIB_APPENDTOVAR],
|
|
||||||
[
|
|
||||||
for element in [$2]; do
|
|
||||||
haveit=
|
|
||||||
for x in $[$1]; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X$element"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
[$1]="${[$1]}${[$1]:+ }$element"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
])
|
|
||||||
|
|
||||||
# lib-ld.m4 serial 3 (gettext-0.13)
|
|
||||||
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software; the Free Software Foundation
|
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
|
||||||
|
|
||||||
dnl Subroutines of libtool.m4,
|
|
||||||
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
|
||||||
dnl with libtool.m4.
|
|
||||||
|
|
||||||
dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
|
|
||||||
AC_DEFUN([AC_LIB_PROG_LD_GNU],
|
|
||||||
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
|
|
||||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
|
||||||
case `$LD -v 2>&1 </dev/null` in
|
|
||||||
*GNU* | *'with BFD'*)
|
|
||||||
acl_cv_prog_gnu_ld=yes ;;
|
|
||||||
*)
|
|
||||||
acl_cv_prog_gnu_ld=no ;;
|
|
||||||
esac])
|
|
||||||
with_gnu_ld=$acl_cv_prog_gnu_ld
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl From libtool-1.4. Sets the variable LD.
|
|
||||||
AC_DEFUN([AC_LIB_PROG_LD],
|
|
||||||
[AC_ARG_WITH(gnu-ld,
|
|
||||||
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
|
||||||
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
|
||||||
AC_REQUIRE([AC_PROG_CC])dnl
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
||||||
# Prepare PATH_SEPARATOR.
|
|
||||||
# The user is always right.
|
|
||||||
if test "${PATH_SEPARATOR+set}" != set; then
|
|
||||||
echo "#! /bin/sh" >conf$$.sh
|
|
||||||
echo "exit 0" >>conf$$.sh
|
|
||||||
chmod +x conf$$.sh
|
|
||||||
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
|
||||||
PATH_SEPARATOR=';'
|
|
||||||
else
|
|
||||||
PATH_SEPARATOR=:
|
|
||||||
fi
|
|
||||||
rm -f conf$$.sh
|
|
||||||
fi
|
|
||||||
ac_prog=ld
|
|
||||||
if test "$GCC" = yes; then
|
|
||||||
# Check if gcc -print-prog-name=ld gives a path.
|
|
||||||
AC_MSG_CHECKING([for ld used by GCC])
|
|
||||||
case $host in
|
|
||||||
*-*-mingw*)
|
|
||||||
# gcc leaves a trailing carriage return which upsets mingw
|
|
||||||
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
|
||||||
*)
|
|
||||||
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
|
||||||
esac
|
|
||||||
case $ac_prog in
|
|
||||||
# Accept absolute paths.
|
|
||||||
[[\\/]* | [A-Za-z]:[\\/]*)]
|
|
||||||
[re_direlt='/[^/][^/]*/\.\./']
|
|
||||||
# Canonicalize the path of ld
|
|
||||||
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
|
||||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
|
||||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
|
||||||
done
|
|
||||||
test -z "$LD" && LD="$ac_prog"
|
|
||||||
;;
|
|
||||||
"")
|
|
||||||
# If it fails, then pretend we aren't using GCC.
|
|
||||||
ac_prog=ld
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# If it is relative, then search for the first ld in PATH.
|
|
||||||
with_gnu_ld=unknown
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
elif test "$with_gnu_ld" = yes; then
|
|
||||||
AC_MSG_CHECKING([for GNU ld])
|
|
||||||
else
|
|
||||||
AC_MSG_CHECKING([for non-GNU ld])
|
|
||||||
fi
|
|
||||||
AC_CACHE_VAL(acl_cv_path_LD,
|
|
||||||
[if test -z "$LD"; then
|
|
||||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
|
||||||
for ac_dir in $PATH; do
|
|
||||||
test -z "$ac_dir" && ac_dir=.
|
|
||||||
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
|
||||||
acl_cv_path_LD="$ac_dir/$ac_prog"
|
|
||||||
# Check to see if the program is GNU ld. I'd rather use --version,
|
|
||||||
# but apparently some GNU ld's only accept -v.
|
|
||||||
# Break only if it was the GNU/non-GNU ld that we prefer.
|
|
||||||
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
|
|
||||||
*GNU* | *'with BFD'*)
|
|
||||||
test "$with_gnu_ld" != no && break ;;
|
|
||||||
*)
|
|
||||||
test "$with_gnu_ld" != yes && break ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS="$ac_save_ifs"
|
|
||||||
else
|
|
||||||
acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
|
||||||
fi])
|
|
||||||
LD="$acl_cv_path_LD"
|
|
||||||
if test -n "$LD"; then
|
|
||||||
AC_MSG_RESULT($LD)
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
fi
|
|
||||||
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
|
||||||
AC_LIB_PROG_LD_GNU
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl This provides configure definitions used by all the winsup
|
dnl This provides configure definitions used by all the winsup
|
||||||
dnl configure.in files.
|
dnl configure.in files.
|
||||||
|
|||||||
303
winsup/mingw/configure
vendored
303
winsup/mingw/configure
vendored
@@ -273,7 +273,7 @@ PACKAGE_BUGREPORT=
|
|||||||
|
|
||||||
ac_unique_file="dllmain.c"
|
ac_unique_file="dllmain.c"
|
||||||
ac_subdirs_all="$ac_subdirs_all profile mingwex"
|
ac_subdirs_all="$ac_subdirs_all profile mingwex"
|
||||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT all_dlls_host install_dlls_host AR ac_ct_AR AS ac_ct_AS RANLIB ac_ct_RANLIB LD ac_ct_LD DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES ALLOCA CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os subdirs MKINSTALLDIRS MNO_CYGWIN THREAD_DLL LIBM_A LIBGMON_A HEADER_SUBDIR W32API_INCLUDE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT with_cross_host all_dlls_host install_dlls_host AR ac_ct_AR AS ac_ct_AS RANLIB ac_ct_RANLIB LD ac_ct_LD DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES ALLOCA CPP EGREP subdirs MKINSTALLDIRS MNO_CYGWIN THREAD_DLL LIBM_A LIBGMON_A HEADER_SUBDIR W32API_INCLUDE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
@@ -1254,6 +1254,114 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
ac_aux_dir=
|
||||||
|
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
||||||
|
if test -f $ac_dir/install-sh; then
|
||||||
|
ac_aux_dir=$ac_dir
|
||||||
|
ac_install_sh="$ac_aux_dir/install-sh -c"
|
||||||
|
break
|
||||||
|
elif test -f $ac_dir/install.sh; then
|
||||||
|
ac_aux_dir=$ac_dir
|
||||||
|
ac_install_sh="$ac_aux_dir/install.sh -c"
|
||||||
|
break
|
||||||
|
elif test -f $ac_dir/shtool; then
|
||||||
|
ac_aux_dir=$ac_dir
|
||||||
|
ac_install_sh="$ac_aux_dir/shtool install -c"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$ac_aux_dir"; then
|
||||||
|
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
||||||
|
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
|
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
||||||
|
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
||||||
|
ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
||||||
|
|
||||||
|
# Make sure we can run config.sub.
|
||||||
|
$ac_config_sub sun4 >/dev/null 2>&1 ||
|
||||||
|
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
||||||
|
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
|
||||||
|
echo "$as_me:$LINENO: checking build system type" >&5
|
||||||
|
echo $ECHO_N "checking build system type... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_build+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
ac_cv_build_alias=$build_alias
|
||||||
|
test -z "$ac_cv_build_alias" &&
|
||||||
|
ac_cv_build_alias=`$ac_config_guess`
|
||||||
|
test -z "$ac_cv_build_alias" &&
|
||||||
|
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
||||||
|
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
|
||||||
|
{ { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
|
||||||
|
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_build" >&6
|
||||||
|
build=$ac_cv_build
|
||||||
|
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||||||
|
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||||||
|
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
|
|
||||||
|
|
||||||
|
echo "$as_me:$LINENO: checking host system type" >&5
|
||||||
|
echo $ECHO_N "checking host system type... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_host+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
ac_cv_host_alias=$host_alias
|
||||||
|
test -z "$ac_cv_host_alias" &&
|
||||||
|
ac_cv_host_alias=$ac_cv_build_alias
|
||||||
|
ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
|
||||||
|
{ { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
|
||||||
|
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_host" >&6
|
||||||
|
host=$ac_cv_host
|
||||||
|
host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||||||
|
host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||||||
|
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
|
|
||||||
|
|
||||||
|
echo "$as_me:$LINENO: checking target system type" >&5
|
||||||
|
echo $ECHO_N "checking target system type... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_target+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
ac_cv_target_alias=$target_alias
|
||||||
|
test "x$ac_cv_target_alias" = "x" &&
|
||||||
|
ac_cv_target_alias=$ac_cv_host_alias
|
||||||
|
ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
|
||||||
|
{ { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
|
||||||
|
echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: $ac_cv_target" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_target" >&6
|
||||||
|
target=$ac_cv_target
|
||||||
|
target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||||||
|
target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||||||
|
target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
|
|
||||||
|
|
||||||
|
# The aliases save the names the user supplied, while $host etc.
|
||||||
|
# will get canonicalized.
|
||||||
|
test -n "$target_alias" &&
|
||||||
|
test "$program_prefix$program_suffix$program_transform_name" = \
|
||||||
|
NONENONEs,x,x, &&
|
||||||
|
program_prefix=${target_alias}-
|
||||||
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
if test -n "$ac_tool_prefix"; then
|
||||||
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
||||||
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||||||
@@ -1677,6 +1785,39 @@ cat confdefs.h >>conftest.$ac_ext
|
|||||||
cat >>conftest.$ac_ext <<_ACEOF
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
# FIXME: Cleanup?
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||||
|
(eval $ac_link) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; then
|
||||||
|
gcc_no_link=no
|
||||||
|
else
|
||||||
|
gcc_no_link=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$gcc_no_link = xyes; then
|
||||||
|
# Setting cross_compile will disable run tests; it will
|
||||||
|
# also disable AC_CHECK_FILE but that's generally
|
||||||
|
# correct if we can't link.
|
||||||
|
cross_compiling=yes
|
||||||
|
EXEEXT=
|
||||||
|
else
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
@@ -1821,6 +1962,7 @@ echo "${ECHO_T}$ac_cv_exeext" >&6
|
|||||||
rm -f conftest.$ac_ext
|
rm -f conftest.$ac_ext
|
||||||
EXEEXT=$ac_cv_exeext
|
EXEEXT=$ac_cv_exeext
|
||||||
ac_exeext=$EXEEXT
|
ac_exeext=$EXEEXT
|
||||||
|
fi
|
||||||
echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
||||||
echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
|
echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
|
||||||
if test "${ac_cv_objext+set}" = set; then
|
if test "${ac_cv_objext+set}" = set; then
|
||||||
@@ -2277,6 +2419,7 @@ esac
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
if test -n "$ac_tool_prefix"; then
|
||||||
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
||||||
set dummy ${ac_tool_prefix}ar; ac_word=$2
|
set dummy ${ac_tool_prefix}ar; ac_word=$2
|
||||||
@@ -2846,6 +2989,8 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
case "$with_cross_host" in
|
||||||
|
""|*mingw*|*cygwin*)
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
@@ -3104,6 +3249,11 @@ echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
|
|||||||
if test "${ac_cv_working_alloca_h+set}" = set; then
|
if test "${ac_cv_working_alloca_h+set}" = set; then
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
else
|
else
|
||||||
|
if test x$gcc_no_link = xyes; then
|
||||||
|
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
|
||||||
|
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@@ -3166,6 +3316,11 @@ echo $ECHO_N "checking for alloca... $ECHO_C" >&6
|
|||||||
if test "${ac_cv_func_alloca_works+set}" = set; then
|
if test "${ac_cv_func_alloca_works+set}" = set; then
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
else
|
else
|
||||||
|
if test x$gcc_no_link = xyes; then
|
||||||
|
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
|
||||||
|
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@@ -3292,6 +3447,11 @@ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
|||||||
if eval "test \"\${$as_ac_var+set}\" = set"; then
|
if eval "test \"\${$as_ac_var+set}\" = set"; then
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
else
|
else
|
||||||
|
if test x$gcc_no_link = xyes; then
|
||||||
|
{ { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5
|
||||||
|
echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@@ -3456,114 +3616,9 @@ _ACEOF
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
ac_aux_dir=
|
|
||||||
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
|
||||||
if test -f $ac_dir/install-sh; then
|
|
||||||
ac_aux_dir=$ac_dir
|
|
||||||
ac_install_sh="$ac_aux_dir/install-sh -c"
|
|
||||||
break
|
|
||||||
elif test -f $ac_dir/install.sh; then
|
|
||||||
ac_aux_dir=$ac_dir
|
|
||||||
ac_install_sh="$ac_aux_dir/install.sh -c"
|
|
||||||
break
|
|
||||||
elif test -f $ac_dir/shtool; then
|
|
||||||
ac_aux_dir=$ac_dir
|
|
||||||
ac_install_sh="$ac_aux_dir/shtool install -c"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$ac_aux_dir"; then
|
|
||||||
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
|
||||||
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
fi
|
|
||||||
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
|
||||||
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
|
||||||
ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
|
||||||
|
|
||||||
# Make sure we can run config.sub.
|
|
||||||
$ac_config_sub sun4 >/dev/null 2>&1 ||
|
|
||||||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
|
||||||
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
|
|
||||||
echo "$as_me:$LINENO: checking build system type" >&5
|
|
||||||
echo $ECHO_N "checking build system type... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_build+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
ac_cv_build_alias=$build_alias
|
|
||||||
test -z "$ac_cv_build_alias" &&
|
|
||||||
ac_cv_build_alias=`$ac_config_guess`
|
|
||||||
test -z "$ac_cv_build_alias" &&
|
|
||||||
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
|
||||||
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
|
|
||||||
{ { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
|
|
||||||
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
|
|
||||||
fi
|
|
||||||
echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_build" >&6
|
|
||||||
build=$ac_cv_build
|
|
||||||
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
||||||
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
||||||
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
||||||
|
|
||||||
|
|
||||||
echo "$as_me:$LINENO: checking host system type" >&5
|
|
||||||
echo $ECHO_N "checking host system type... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_host+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
ac_cv_host_alias=$host_alias
|
|
||||||
test -z "$ac_cv_host_alias" &&
|
|
||||||
ac_cv_host_alias=$ac_cv_build_alias
|
|
||||||
ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
|
|
||||||
{ { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
|
|
||||||
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
|
|
||||||
fi
|
|
||||||
echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_host" >&6
|
|
||||||
host=$ac_cv_host
|
|
||||||
host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
||||||
host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
||||||
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
||||||
|
|
||||||
|
|
||||||
echo "$as_me:$LINENO: checking target system type" >&5
|
|
||||||
echo $ECHO_N "checking target system type... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_target+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
ac_cv_target_alias=$target_alias
|
|
||||||
test "x$ac_cv_target_alias" = "x" &&
|
|
||||||
ac_cv_target_alias=$ac_cv_host_alias
|
|
||||||
ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
|
|
||||||
{ { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
|
|
||||||
echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
|
|
||||||
fi
|
|
||||||
echo "$as_me:$LINENO: result: $ac_cv_target" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_target" >&6
|
|
||||||
target=$ac_cv_target
|
|
||||||
target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
||||||
target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
||||||
target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
||||||
|
|
||||||
|
|
||||||
# The aliases save the names the user supplied, while $host etc.
|
|
||||||
# will get canonicalized.
|
|
||||||
test -n "$target_alias" &&
|
|
||||||
test "$program_prefix$program_suffix$program_transform_name" = \
|
|
||||||
NONENONEs,x,x, &&
|
|
||||||
program_prefix=${target_alias}-
|
|
||||||
|
|
||||||
|
|
||||||
subdirs="$subdirs profile mingwex"
|
subdirs="$subdirs profile mingwex"
|
||||||
@@ -3797,10 +3852,9 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
|
|||||||
# 1. Remove the extension, and $U if already installed.
|
# 1. Remove the extension, and $U if already installed.
|
||||||
ac_i=`echo "$ac_i" |
|
ac_i=`echo "$ac_i" |
|
||||||
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
|
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
|
||||||
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
|
# 2. Add them.
|
||||||
# will be set to the directory where LIBOBJS objects are built.
|
ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
|
||||||
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
|
ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
|
||||||
ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
|
|
||||||
done
|
done
|
||||||
LIBOBJS=$ac_libobjs
|
LIBOBJS=$ac_libobjs
|
||||||
|
|
||||||
@@ -4320,6 +4374,18 @@ s,@ECHO_C@,$ECHO_C,;t t
|
|||||||
s,@ECHO_N@,$ECHO_N,;t t
|
s,@ECHO_N@,$ECHO_N,;t t
|
||||||
s,@ECHO_T@,$ECHO_T,;t t
|
s,@ECHO_T@,$ECHO_T,;t t
|
||||||
s,@LIBS@,$LIBS,;t t
|
s,@LIBS@,$LIBS,;t t
|
||||||
|
s,@build@,$build,;t t
|
||||||
|
s,@build_cpu@,$build_cpu,;t t
|
||||||
|
s,@build_vendor@,$build_vendor,;t t
|
||||||
|
s,@build_os@,$build_os,;t t
|
||||||
|
s,@host@,$host,;t t
|
||||||
|
s,@host_cpu@,$host_cpu,;t t
|
||||||
|
s,@host_vendor@,$host_vendor,;t t
|
||||||
|
s,@host_os@,$host_os,;t t
|
||||||
|
s,@target@,$target,;t t
|
||||||
|
s,@target_cpu@,$target_cpu,;t t
|
||||||
|
s,@target_vendor@,$target_vendor,;t t
|
||||||
|
s,@target_os@,$target_os,;t t
|
||||||
s,@CC@,$CC,;t t
|
s,@CC@,$CC,;t t
|
||||||
s,@ac_ct_CC@,$ac_ct_CC,;t t
|
s,@ac_ct_CC@,$ac_ct_CC,;t t
|
||||||
s,@CFLAGS@,$CFLAGS,;t t
|
s,@CFLAGS@,$CFLAGS,;t t
|
||||||
@@ -4327,6 +4393,7 @@ s,@LDFLAGS@,$LDFLAGS,;t t
|
|||||||
s,@CPPFLAGS@,$CPPFLAGS,;t t
|
s,@CPPFLAGS@,$CPPFLAGS,;t t
|
||||||
s,@EXEEXT@,$EXEEXT,;t t
|
s,@EXEEXT@,$EXEEXT,;t t
|
||||||
s,@OBJEXT@,$OBJEXT,;t t
|
s,@OBJEXT@,$OBJEXT,;t t
|
||||||
|
s,@with_cross_host@,$with_cross_host,;t t
|
||||||
s,@all_dlls_host@,$all_dlls_host,;t t
|
s,@all_dlls_host@,$all_dlls_host,;t t
|
||||||
s,@install_dlls_host@,$install_dlls_host,;t t
|
s,@install_dlls_host@,$install_dlls_host,;t t
|
||||||
s,@AR@,$AR,;t t
|
s,@AR@,$AR,;t t
|
||||||
@@ -4346,18 +4413,6 @@ s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t
|
|||||||
s,@ALLOCA@,$ALLOCA,;t t
|
s,@ALLOCA@,$ALLOCA,;t t
|
||||||
s,@CPP@,$CPP,;t t
|
s,@CPP@,$CPP,;t t
|
||||||
s,@EGREP@,$EGREP,;t t
|
s,@EGREP@,$EGREP,;t t
|
||||||
s,@build@,$build,;t t
|
|
||||||
s,@build_cpu@,$build_cpu,;t t
|
|
||||||
s,@build_vendor@,$build_vendor,;t t
|
|
||||||
s,@build_os@,$build_os,;t t
|
|
||||||
s,@host@,$host,;t t
|
|
||||||
s,@host_cpu@,$host_cpu,;t t
|
|
||||||
s,@host_vendor@,$host_vendor,;t t
|
|
||||||
s,@host_os@,$host_os,;t t
|
|
||||||
s,@target@,$target,;t t
|
|
||||||
s,@target_cpu@,$target_cpu,;t t
|
|
||||||
s,@target_vendor@,$target_vendor,;t t
|
|
||||||
s,@target_os@,$target_os,;t t
|
|
||||||
s,@subdirs@,$subdirs,;t t
|
s,@subdirs@,$subdirs,;t t
|
||||||
s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
|
s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
|
||||||
s,@MNO_CYGWIN@,$MNO_CYGWIN,;t t
|
s,@MNO_CYGWIN@,$MNO_CYGWIN,;t t
|
||||||
|
|||||||
@@ -19,12 +19,15 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_INIT(dllmain.c)
|
AC_INIT(dllmain.c)
|
||||||
|
|
||||||
|
AC_CANONICAL_SYSTEM
|
||||||
|
GCC_NO_EXECUTABLES
|
||||||
LIB_AC_PROG_CC
|
LIB_AC_PROG_CC
|
||||||
|
|
||||||
case "$with_cross_host" in
|
case "$with_cross_host" in
|
||||||
""|*cygwin*) all_dlls_host='all_dlls_host'
|
""|*cygwin*) all_dlls_host='all_dlls_host'
|
||||||
install_dlls_host='install_dlls_host';;
|
install_dlls_host='install_dlls_host';;
|
||||||
esac
|
esac
|
||||||
|
AC_SUBST(with_cross_host)
|
||||||
AC_SUBST(all_dlls_host)
|
AC_SUBST(all_dlls_host)
|
||||||
AC_SUBST(install_dlls_host)
|
AC_SUBST(install_dlls_host)
|
||||||
|
|
||||||
@@ -44,9 +47,12 @@ AC_SUBST(DLLWRAP)
|
|||||||
AC_CHECK_TOOL(WINDRES, windres, windres)
|
AC_CHECK_TOOL(WINDRES, windres, windres)
|
||||||
AC_SUBST(WINDRES)
|
AC_SUBST(WINDRES)
|
||||||
|
|
||||||
|
case "$with_cross_host" in
|
||||||
|
""|*mingw*|*cygwin*)
|
||||||
AC_ALLOCA
|
AC_ALLOCA
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_CANONICAL_SYSTEM
|
|
||||||
AC_CONFIG_SUBDIRS(profile mingwex)
|
AC_CONFIG_SUBDIRS(profile mingwex)
|
||||||
HEADER_SUBDIR=""
|
HEADER_SUBDIR=""
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user