1082 lines
36 KiB
Plaintext
1082 lines
36 KiB
Plaintext
Index: libffi/ChangeLog
|
|
===================================================================
|
|
--- libffi.orig/ChangeLog
|
|
+++ libffi/ChangeLog
|
|
@@ -1,3 +1,10 @@
|
|
+2010-11-22 Jacek Caban <jacek@codeweavers.com>
|
|
+
|
|
+ * configure.ac: Check for symbol underscores on mingw-w64.
|
|
+ * configure: Rebuilt.
|
|
+ * src/x86/win64.S: Correctly access extern symbols in respect to
|
|
+ underscores.
|
|
+
|
|
2010-11-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
|
|
|
|
* testsuite/lib/libffi-dg.exp: Rename ...
|
|
Index: libffi/configure.ac
|
|
===================================================================
|
|
--- libffi.orig/configure.ac
|
|
+++ libffi/configure.ac
|
|
@@ -314,6 +314,13 @@ if test x$TARGET = xX86 || test x$TARGET
|
|
fi
|
|
fi
|
|
|
|
+if test x$TARGET = xX86_WIN64; then
|
|
+ LT_SYS_SYMBOL_USCORE
|
|
+ if test "x$sys_symbol_underscore" = xyes; then
|
|
+ AC_DEFINE(SYMBOL_UNDERSCORE, 1, [Define if symbols are underscored.])
|
|
+ fi
|
|
+fi
|
|
+
|
|
case "$target" in
|
|
*-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
|
|
AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
|
|
Index: libffi/src/x86/win64.S
|
|
===================================================================
|
|
--- libffi.orig/src/x86/win64.S
|
|
+++ libffi/src/x86/win64.S
|
|
@@ -232,10 +232,18 @@ ret_void$:
|
|
ffi_call_win64 ENDP
|
|
_TEXT ENDS
|
|
END
|
|
-#else
|
|
+
|
|
+#else
|
|
+
|
|
+#ifdef SYMBOL_UNDERSCORE
|
|
+#define SYMBOL_NAME(name) _##name
|
|
+#else
|
|
+#define SYMBOL_NAME(name) name
|
|
+#endif
|
|
+
|
|
.text
|
|
|
|
-.extern _ffi_closure_win64_inner
|
|
+.extern SYMBOL_NAME(ffi_closure_win64_inner)
|
|
|
|
# ffi_closure_win64 will be called with these registers set:
|
|
# rax points to 'closure'
|
|
@@ -246,8 +254,8 @@ END
|
|
# call ffi_closure_win64_inner for the actual work, then return the result.
|
|
#
|
|
.balign 16
|
|
- .globl _ffi_closure_win64
|
|
-_ffi_closure_win64:
|
|
+ .globl SYMBOL_NAME(ffi_closure_win64)
|
|
+SYMBOL_NAME(ffi_closure_win64):
|
|
# copy register arguments onto stack
|
|
test $1,%r11
|
|
jne .Lfirst_is_float
|
|
@@ -287,7 +295,7 @@ _ffi_closure_win64:
|
|
mov %rax, %rcx # context is first parameter
|
|
mov %rsp, %rdx # stack is second parameter
|
|
add $48, %rdx # point to start of arguments
|
|
- mov $_ffi_closure_win64_inner, %rax
|
|
+ mov $SYMBOL_NAME(ffi_closure_win64_inner), %rax
|
|
callq *%rax # call the real closure function
|
|
add $40, %rsp
|
|
movq %rax, %xmm0 # If the closure returned a float,
|
|
@@ -296,8 +304,8 @@ _ffi_closure_win64:
|
|
.ffi_closure_win64_end:
|
|
|
|
.balign 16
|
|
- .globl _ffi_call_win64
|
|
-_ffi_call_win64:
|
|
+ .globl SYMBOL_NAME(ffi_call_win64)
|
|
+SYMBOL_NAME(ffi_call_win64):
|
|
# copy registers onto stack
|
|
mov %r9,32(%rsp)
|
|
mov %r8,24(%rsp)
|
|
Index: libffi/aclocal.m4
|
|
===================================================================
|
|
--- libffi.orig/aclocal.m4
|
|
+++ libffi/aclocal.m4
|
|
@@ -7364,6 +7364,811 @@ _LT_EOF
|
|
esac
|
|
])
|
|
|
|
+# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
|
|
+#
|
|
+# Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc.
|
|
+# Written by Thomas Tanner, 1999
|
|
+#
|
|
+# This file is free software; the Free Software Foundation gives
|
|
+# unlimited permission to copy and/or distribute it, with or without
|
|
+# modifications, as long as this notice is preserved.
|
|
+
|
|
+# serial 17 LTDL_INIT
|
|
+
|
|
+# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
|
|
+# ------------------------------------------
|
|
+# DIRECTORY contains the libltdl sources. It is okay to call this
|
|
+# function multiple times, as long as the same DIRECTORY is always given.
|
|
+AC_DEFUN([LT_CONFIG_LTDL_DIR],
|
|
+[AC_BEFORE([$0], [LTDL_INIT])
|
|
+_$0($*)
|
|
+])# LT_CONFIG_LTDL_DIR
|
|
+
|
|
+# We break this out into a separate macro, so that we can call it safely
|
|
+# internally without being caught accidentally by the sed scan in libtoolize.
|
|
+m4_defun([_LT_CONFIG_LTDL_DIR],
|
|
+[dnl remove trailing slashes
|
|
+m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$]))
|
|
+m4_case(_LTDL_DIR,
|
|
+ [], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.'
|
|
+ m4_if(_ARG_DIR, [.],
|
|
+ [],
|
|
+ [m4_define([_LTDL_DIR], _ARG_DIR)
|
|
+ _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])],
|
|
+ [m4_if(_ARG_DIR, _LTDL_DIR,
|
|
+ [],
|
|
+ [m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', `]_ARG_DIR['])])])
|
|
+m4_popdef([_ARG_DIR])
|
|
+])# _LT_CONFIG_LTDL_DIR
|
|
+
|
|
+# Initialise:
|
|
+m4_define([_LTDL_DIR], [])
|
|
+
|
|
+
|
|
+# _LT_BUILD_PREFIX
|
|
+# ----------------
|
|
+# If Autoconf is new enough, expand to `${top_build_prefix}', otherwise
|
|
+# to `${top_builddir}/'.
|
|
+m4_define([_LT_BUILD_PREFIX],
|
|
+[m4_ifdef([AC_AUTOCONF_VERSION],
|
|
+ [m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]),
|
|
+ [-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX],
|
|
+ [${top_build_prefix}],
|
|
+ [${top_builddir}/])],
|
|
+ [${top_build_prefix}])],
|
|
+ [${top_builddir}/])[]dnl
|
|
+])
|
|
+
|
|
+
|
|
+# LTDL_CONVENIENCE
|
|
+# ----------------
|
|
+# sets LIBLTDL to the link flags for the libltdl convenience library and
|
|
+# LTDLINCL to the include flags for the libltdl header and adds
|
|
+# --enable-ltdl-convenience to the configure arguments. Note that
|
|
+# AC_CONFIG_SUBDIRS is not called here. LIBLTDL will be prefixed with
|
|
+# '${top_build_prefix}' if available, otherwise with '${top_builddir}/',
|
|
+# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
|
|
+# quotes!). If your package is not flat and you're not using automake,
|
|
+# define top_build_prefix, top_builddir, and top_srcdir appropriately
|
|
+# in your Makefiles.
|
|
+AC_DEFUN([LTDL_CONVENIENCE],
|
|
+[AC_BEFORE([$0], [LTDL_INIT])dnl
|
|
+dnl Although the argument is deprecated and no longer documented,
|
|
+dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one
|
|
+dnl here make sure it is the same as any other declaration of libltdl's
|
|
+dnl location! This also ensures lt_ltdl_dir is set when configure.ac is
|
|
+dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
|
|
+m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
|
|
+_$0()
|
|
+])# LTDL_CONVENIENCE
|
|
+
|
|
+# AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools,
|
|
+# now we have LT_CONFIG_LTDL_DIR:
|
|
+AU_DEFUN([AC_LIBLTDL_CONVENIENCE],
|
|
+[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
|
|
+_LTDL_CONVENIENCE])
|
|
+
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [])
|
|
+
|
|
+
|
|
+# _LTDL_CONVENIENCE
|
|
+# -----------------
|
|
+# Code shared by LTDL_CONVENIENCE and LTDL_INIT([convenience]).
|
|
+m4_defun([_LTDL_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='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
|
|
+LTDLDEPS=$LIBLTDL
|
|
+LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
|
|
+
|
|
+AC_SUBST([LIBLTDL])
|
|
+AC_SUBST([LTDLDEPS])
|
|
+AC_SUBST([LTDLINCL])
|
|
+
|
|
+# For backwards non-gettext consistent compatibility...
|
|
+INCLTDL="$LTDLINCL"
|
|
+AC_SUBST([INCLTDL])
|
|
+])# _LTDL_CONVENIENCE
|
|
+
|
|
+
|
|
+# LTDL_INSTALLABLE
|
|
+# ----------------
|
|
+# sets LIBLTDL to the link flags for the libltdl installable library
|
|
+# and LTDLINCL to the include flags for the libltdl header and adds
|
|
+# --enable-ltdl-install to the configure arguments. Note that
|
|
+# AC_CONFIG_SUBDIRS is not called from here. If an installed libltdl
|
|
+# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if
|
|
+# available, otherwise with '${top_builddir}/', and LTDLINCL will be
|
|
+# prefixed with '${top_srcdir}/' (note the single quotes!). If your
|
|
+# package is not flat and you're not using automake, define top_build_prefix,
|
|
+# top_builddir, and top_srcdir appropriately in your Makefiles.
|
|
+# In the future, this macro may have to be called after LT_INIT.
|
|
+AC_DEFUN([LTDL_INSTALLABLE],
|
|
+[AC_BEFORE([$0], [LTDL_INIT])dnl
|
|
+dnl Although the argument is deprecated and no longer documented,
|
|
+dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one
|
|
+dnl here make sure it is the same as any other declaration of libltdl's
|
|
+dnl location! This also ensures lt_ltdl_dir is set when configure.ac is
|
|
+dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
|
|
+m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
|
|
+_$0()
|
|
+])# LTDL_INSTALLABLE
|
|
+
|
|
+# AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools,
|
|
+# now we have LT_CONFIG_LTDL_DIR:
|
|
+AU_DEFUN([AC_LIBLTDL_INSTALLABLE],
|
|
+[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
|
|
+_LTDL_INSTALLABLE])
|
|
+
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [])
|
|
+
|
|
+
|
|
+# _LTDL_INSTALLABLE
|
|
+# -----------------
|
|
+# Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]).
|
|
+m4_defun([_LTDL_INSTALLABLE],
|
|
+[if test -f $prefix/lib/libltdl.la; then
|
|
+ lt_save_LDFLAGS="$LDFLAGS"
|
|
+ LDFLAGS="-L$prefix/lib $LDFLAGS"
|
|
+ AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes])
|
|
+ LDFLAGS="$lt_save_LDFLAGS"
|
|
+ if test x"${lt_lib_ltdl-no}" = xyes; then
|
|
+ if test x"$enable_ltdl_install" != xyes; then
|
|
+ # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install
|
|
+ AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install'])
|
|
+ enable_ltdl_install=no
|
|
+ fi
|
|
+ elif test x"$enable_ltdl_install" = xno; then
|
|
+ AC_MSG_WARN([libltdl not installed, but installation disabled])
|
|
+ fi
|
|
+fi
|
|
+
|
|
+# If configure.ac declared an installable ltdl, and the user didn't override
|
|
+# with --disable-ltdl-install, we will install the shipped libltdl.
|
|
+case $enable_ltdl_install in
|
|
+ no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
|
|
+ LIBLTDL="-lltdl"
|
|
+ LTDLDEPS=
|
|
+ LTDLINCL=
|
|
+ ;;
|
|
+ *) enable_ltdl_install=yes
|
|
+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
|
|
+ LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la"
|
|
+ LTDLDEPS=$LIBLTDL
|
|
+ LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+AC_SUBST([LIBLTDL])
|
|
+AC_SUBST([LTDLDEPS])
|
|
+AC_SUBST([LTDLINCL])
|
|
+
|
|
+# For backwards non-gettext consistent compatibility...
|
|
+INCLTDL="$LTDLINCL"
|
|
+AC_SUBST([INCLTDL])
|
|
+])# LTDL_INSTALLABLE
|
|
+
|
|
+
|
|
+# _LTDL_MODE_DISPATCH
|
|
+# -------------------
|
|
+m4_define([_LTDL_MODE_DISPATCH],
|
|
+[dnl If _LTDL_DIR is `.', then we are configuring libltdl itself:
|
|
+m4_if(_LTDL_DIR, [],
|
|
+ [],
|
|
+ dnl if _LTDL_MODE was not set already, the default value is `subproject':
|
|
+ [m4_case(m4_default(_LTDL_MODE, [subproject]),
|
|
+ [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR)
|
|
+ _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])],
|
|
+ [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"; lt_libobj_prefix="$lt_ltdl_dir/"])],
|
|
+ [recursive], [],
|
|
+ [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl
|
|
+dnl Be careful not to expand twice:
|
|
+m4_define([$0], [])
|
|
+])# _LTDL_MODE_DISPATCH
|
|
+
|
|
+
|
|
+# _LT_LIBOBJ(MODULE_NAME)
|
|
+# -----------------------
|
|
+# Like AC_LIBOBJ, except that MODULE_NAME goes into _LT_LIBOBJS instead
|
|
+# of into LIBOBJS.
|
|
+AC_DEFUN([_LT_LIBOBJ], [
|
|
+ m4_pattern_allow([^_LT_LIBOBJS$])
|
|
+ _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
|
|
+])# _LT_LIBOBJS
|
|
+
|
|
+
|
|
+# LTDL_INIT([OPTIONS])
|
|
+# --------------------
|
|
+# Clients of libltdl can use this macro to allow the installer to
|
|
+# choose between a shipped copy of the ltdl sources or a preinstalled
|
|
+# version of the library. If the shipped ltdl sources are not in a
|
|
+# subdirectory named libltdl, the directory name must be given by
|
|
+# LT_CONFIG_LTDL_DIR.
|
|
+AC_DEFUN([LTDL_INIT],
|
|
+[dnl Parse OPTIONS
|
|
+_LT_SET_OPTIONS([$0], [$1])
|
|
+
|
|
+dnl We need to keep our own list of libobjs separate from our parent project,
|
|
+dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
|
|
+dnl we look for our own LIBOBJs.
|
|
+m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ]))
|
|
+m4_pushdef([AC_LIBSOURCES])
|
|
+
|
|
+dnl If not otherwise defined, default to the 1.5.x compatible subproject mode:
|
|
+m4_if(_LTDL_MODE, [],
|
|
+ [m4_define([_LTDL_MODE], m4_default([$2], [subproject]))
|
|
+ m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])],
|
|
+ [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])
|
|
+
|
|
+AC_ARG_WITH([included_ltdl],
|
|
+ [AS_HELP_STRING([--with-included-ltdl],
|
|
+ [use the GNU ltdl sources included here])])
|
|
+
|
|
+if test "x$with_included_ltdl" != xyes; then
|
|
+ # We are not being forced to use the included libltdl sources, so
|
|
+ # decide whether there is a useful installed version we can use.
|
|
+ AC_CHECK_HEADER([ltdl.h],
|
|
+ [AC_CHECK_DECL([lt_dlinterface_register],
|
|
+ [AC_CHECK_LIB([ltdl], [lt_dladvise_preload],
|
|
+ [with_included_ltdl=no],
|
|
+ [with_included_ltdl=yes])],
|
|
+ [with_included_ltdl=yes],
|
|
+ [AC_INCLUDES_DEFAULT
|
|
+ #include <ltdl.h>])],
|
|
+ [with_included_ltdl=yes],
|
|
+ [AC_INCLUDES_DEFAULT]
|
|
+ )
|
|
+fi
|
|
+
|
|
+dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE
|
|
+dnl was called yet, then for old times' sake, we assume libltdl is in an
|
|
+dnl eponymous directory:
|
|
+AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])])
|
|
+
|
|
+AC_ARG_WITH([ltdl_include],
|
|
+ [AS_HELP_STRING([--with-ltdl-include=DIR],
|
|
+ [use the ltdl headers installed in DIR])])
|
|
+
|
|
+if test -n "$with_ltdl_include"; then
|
|
+ if test -f "$with_ltdl_include/ltdl.h"; then :
|
|
+ else
|
|
+ AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include'])
|
|
+ fi
|
|
+else
|
|
+ with_ltdl_include=no
|
|
+fi
|
|
+
|
|
+AC_ARG_WITH([ltdl_lib],
|
|
+ [AS_HELP_STRING([--with-ltdl-lib=DIR],
|
|
+ [use the libltdl.la installed in DIR])])
|
|
+
|
|
+if test -n "$with_ltdl_lib"; then
|
|
+ if test -f "$with_ltdl_lib/libltdl.la"; then :
|
|
+ else
|
|
+ AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib'])
|
|
+ fi
|
|
+else
|
|
+ with_ltdl_lib=no
|
|
+fi
|
|
+
|
|
+case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
|
|
+ ,yes,no,no,)
|
|
+ m4_case(m4_default(_LTDL_TYPE, [convenience]),
|
|
+ [convenience], [_LTDL_CONVENIENCE],
|
|
+ [installable], [_LTDL_INSTALLABLE],
|
|
+ [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)])
|
|
+ ;;
|
|
+ ,no,no,no,)
|
|
+ # If the included ltdl is not to be used, then use the
|
|
+ # preinstalled libltdl we found.
|
|
+ AC_DEFINE([HAVE_LTDL], [1],
|
|
+ [Define this if a modern libltdl is already installed])
|
|
+ LIBLTDL=-lltdl
|
|
+ LTDLDEPS=
|
|
+ LTDLINCL=
|
|
+ ;;
|
|
+ ,no*,no,*)
|
|
+ AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together])
|
|
+ ;;
|
|
+ *) with_included_ltdl=no
|
|
+ LIBLTDL="-L$with_ltdl_lib -lltdl"
|
|
+ LTDLDEPS=
|
|
+ LTDLINCL="-I$with_ltdl_include"
|
|
+ ;;
|
|
+esac
|
|
+INCLTDL="$LTDLINCL"
|
|
+
|
|
+# Report our decision...
|
|
+AC_MSG_CHECKING([where to find libltdl headers])
|
|
+AC_MSG_RESULT([$LTDLINCL])
|
|
+AC_MSG_CHECKING([where to find libltdl library])
|
|
+AC_MSG_RESULT([$LIBLTDL])
|
|
+
|
|
+_LTDL_SETUP
|
|
+
|
|
+dnl restore autoconf definition.
|
|
+m4_popdef([AC_LIBOBJ])
|
|
+m4_popdef([AC_LIBSOURCES])
|
|
+
|
|
+AC_CONFIG_COMMANDS_PRE([
|
|
+ _ltdl_libobjs=
|
|
+ _ltdl_ltlibobjs=
|
|
+ if test -n "$_LT_LIBOBJS"; then
|
|
+ # Remove the extension.
|
|
+ _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
|
|
+ for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do
|
|
+ _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
|
|
+ _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
|
|
+ done
|
|
+ fi
|
|
+ AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs])
|
|
+ AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs])
|
|
+])
|
|
+
|
|
+# Only expand once:
|
|
+m4_define([LTDL_INIT])
|
|
+])# LTDL_INIT
|
|
+
|
|
+# Old names:
|
|
+AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
|
|
+AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
|
|
+AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LIB_LTDL], [])
|
|
+dnl AC_DEFUN([AC_WITH_LTDL], [])
|
|
+dnl AC_DEFUN([LT_WITH_LTDL], [])
|
|
+
|
|
+
|
|
+# _LTDL_SETUP
|
|
+# -----------
|
|
+# Perform all the checks necessary for compilation of the ltdl objects
|
|
+# -- including compiler checks and header checks. This is a public
|
|
+# interface mainly for the benefit of libltdl's own configure.ac, most
|
|
+# other users should call LTDL_INIT instead.
|
|
+AC_DEFUN([_LTDL_SETUP],
|
|
+[AC_REQUIRE([AC_PROG_CC])dnl
|
|
+AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
|
|
+AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
|
|
+AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
|
|
+AC_REQUIRE([LT_LIB_DLLOAD])dnl
|
|
+AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
|
|
+AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl
|
|
+AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl
|
|
+AC_REQUIRE([gl_FUNC_ARGZ])dnl
|
|
+
|
|
+m4_require([_LT_CHECK_OBJDIR])dnl
|
|
+m4_require([_LT_HEADER_DLFCN])dnl
|
|
+m4_require([_LT_CHECK_DLPREOPEN])dnl
|
|
+m4_require([_LT_DECL_SED])dnl
|
|
+
|
|
+dnl Don't require this, or it will be expanded earlier than the code
|
|
+dnl that sets the variables it relies on:
|
|
+_LT_ENABLE_INSTALL
|
|
+
|
|
+dnl _LTDL_MODE specific code must be called at least once:
|
|
+_LTDL_MODE_DISPATCH
|
|
+
|
|
+# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
|
|
+# the user used. This is so that ltdl.h can pick up the parent projects
|
|
+# config.h file, The first file in AC_CONFIG_HEADERS must contain the
|
|
+# definitions required by ltdl.c.
|
|
+# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
|
|
+AC_CONFIG_COMMANDS_PRE([dnl
|
|
+m4_pattern_allow([^LT_CONFIG_H$])dnl
|
|
+m4_ifset([AH_HEADER],
|
|
+ [LT_CONFIG_H=AH_HEADER],
|
|
+ [m4_ifset([AC_LIST_HEADERS],
|
|
+ [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[ :]].*$,,'`],
|
|
+ [])])])
|
|
+AC_SUBST([LT_CONFIG_H])
|
|
+
|
|
+AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
|
|
+ [], [], [AC_INCLUDES_DEFAULT])
|
|
+
|
|
+AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
|
|
+AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
|
|
+
|
|
+AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
|
|
+
|
|
+name=ltdl
|
|
+LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
|
|
+AC_SUBST([LTDLOPEN])
|
|
+])# _LTDL_SETUP
|
|
+
|
|
+
|
|
+# _LT_ENABLE_INSTALL
|
|
+# ------------------
|
|
+m4_define([_LT_ENABLE_INSTALL],
|
|
+[AC_ARG_ENABLE([ltdl-install],
|
|
+ [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])])
|
|
+
|
|
+case ,${enable_ltdl_install},${enable_ltdl_convenience} in
|
|
+ *yes*) ;;
|
|
+ *) enable_ltdl_convenience=yes ;;
|
|
+esac
|
|
+
|
|
+m4_ifdef([AM_CONDITIONAL],
|
|
+[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
|
|
+ AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)])
|
|
+])# _LT_ENABLE_INSTALL
|
|
+
|
|
+
|
|
+# LT_SYS_DLOPEN_DEPLIBS
|
|
+# ---------------------
|
|
+AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS],
|
|
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
+AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
|
|
+ [lt_cv_sys_dlopen_deplibs],
|
|
+ [# PORTME does your system automatically load deplibs for dlopen?
|
|
+ # or its logical equivalent (e.g. shl_load for HP-UX < 11)
|
|
+ # For now, we just catch OSes we know something about -- in the
|
|
+ # future, we'll try test this programmatically.
|
|
+ lt_cv_sys_dlopen_deplibs=unknown
|
|
+ case $host_os in
|
|
+ aix3*|aix4.1.*|aix4.2.*)
|
|
+ # Unknown whether this is true for these versions of AIX, but
|
|
+ # we want this `case' here to explicitly catch those versions.
|
|
+ lt_cv_sys_dlopen_deplibs=unknown
|
|
+ ;;
|
|
+ aix[[4-9]]*)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ amigaos*)
|
|
+ case $host_cpu in
|
|
+ powerpc)
|
|
+ lt_cv_sys_dlopen_deplibs=no
|
|
+ ;;
|
|
+ esac
|
|
+ ;;
|
|
+ darwin*)
|
|
+ # Assuming the user has installed a libdl from somewhere, this is true
|
|
+ # If you are looking for one http://www.opendarwin.org/projects/dlcompat
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ freebsd* | dragonfly*)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ gnu* | linux* | k*bsd*-gnu)
|
|
+ # GNU and its variants, using gnu ld.so (Glibc)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ hpux10*|hpux11*)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ interix*)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ irix[[12345]]*|irix6.[[01]]*)
|
|
+ # Catch all versions of IRIX before 6.2, and indicate that we don't
|
|
+ # know how it worked for any of those versions.
|
|
+ lt_cv_sys_dlopen_deplibs=unknown
|
|
+ ;;
|
|
+ irix*)
|
|
+ # The case above catches anything before 6.2, and it's known that
|
|
+ # at 6.2 and later dlopen does load deplibs.
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ netbsd*)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ openbsd*)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ osf[[1234]]*)
|
|
+ # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
|
|
+ # it did *not* use an RPATH in a shared library to find objects the
|
|
+ # library depends on, so we explicitly say `no'.
|
|
+ lt_cv_sys_dlopen_deplibs=no
|
|
+ ;;
|
|
+ osf5.0|osf5.0a|osf5.1)
|
|
+ # dlopen *does* load deplibs and with the right loader patch applied
|
|
+ # it even uses RPATH in a shared library to search for shared objects
|
|
+ # that the library depends on, but there's no easy way to know if that
|
|
+ # patch is installed. Since this is the case, all we can really
|
|
+ # say is unknown -- it depends on the patch being installed. If
|
|
+ # it is, this changes to `yes'. Without it, it would be `no'.
|
|
+ lt_cv_sys_dlopen_deplibs=unknown
|
|
+ ;;
|
|
+ osf*)
|
|
+ # the two cases above should catch all versions of osf <= 5.1. Read
|
|
+ # the comments above for what we know about them.
|
|
+ # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
|
|
+ # is used to find them so we can finally say `yes'.
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ qnx*)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ solaris*)
|
|
+ lt_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
|
|
+ libltdl_cv_sys_dlopen_deplibs=yes
|
|
+ ;;
|
|
+ esac
|
|
+ ])
|
|
+if test "$lt_cv_sys_dlopen_deplibs" != yes; then
|
|
+ AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
|
|
+ [Define if the OS needs help to load dependent libraries for dlopen().])
|
|
+fi
|
|
+])# LT_SYS_DLOPEN_DEPLIBS
|
|
+
|
|
+# Old name:
|
|
+AU_ALIAS([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS])
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [])
|
|
+
|
|
+
|
|
+# LT_SYS_MODULE_EXT
|
|
+# -----------------
|
|
+AC_DEFUN([LT_SYS_MODULE_EXT],
|
|
+[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
|
|
+AC_CACHE_CHECK([which extension is used for runtime loadable modules],
|
|
+ [libltdl_cv_shlibext],
|
|
+[
|
|
+module=yes
|
|
+eval libltdl_cv_shlibext=$shrext_cmds
|
|
+ ])
|
|
+if test -n "$libltdl_cv_shlibext"; then
|
|
+ m4_pattern_allow([LT_MODULE_EXT])dnl
|
|
+ AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"],
|
|
+ [Define to the extension used for runtime loadable modules, say, ".so".])
|
|
+fi
|
|
+])# LT_SYS_MODULE_EXT
|
|
+
|
|
+# Old name:
|
|
+AU_ALIAS([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT])
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LTDL_SHLIBEXT], [])
|
|
+
|
|
+
|
|
+# LT_SYS_MODULE_PATH
|
|
+# ------------------
|
|
+AC_DEFUN([LT_SYS_MODULE_PATH],
|
|
+[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
|
|
+AC_CACHE_CHECK([which variable specifies run-time module search path],
|
|
+ [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"])
|
|
+if test -n "$lt_cv_module_path_var"; then
|
|
+ m4_pattern_allow([LT_MODULE_PATH_VAR])dnl
|
|
+ AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"],
|
|
+ [Define to the name of the environment variable that determines the run-time module search path.])
|
|
+fi
|
|
+])# LT_SYS_MODULE_PATH
|
|
+
|
|
+# Old name:
|
|
+AU_ALIAS([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH])
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LTDL_SHLIBPATH], [])
|
|
+
|
|
+
|
|
+# LT_SYS_DLSEARCH_PATH
|
|
+# --------------------
|
|
+AC_DEFUN([LT_SYS_DLSEARCH_PATH],
|
|
+[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
|
|
+AC_CACHE_CHECK([for the default library search path],
|
|
+ [lt_cv_sys_dlsearch_path],
|
|
+ [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"])
|
|
+if test -n "$lt_cv_sys_dlsearch_path"; then
|
|
+ sys_dlsearch_path=
|
|
+ for dir in $lt_cv_sys_dlsearch_path; do
|
|
+ if test -z "$sys_dlsearch_path"; then
|
|
+ sys_dlsearch_path="$dir"
|
|
+ else
|
|
+ sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
|
|
+ fi
|
|
+ done
|
|
+ m4_pattern_allow([LT_DLSEARCH_PATH])dnl
|
|
+ AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"],
|
|
+ [Define to the system default library search path.])
|
|
+fi
|
|
+])# LT_SYS_DLSEARCH_PATH
|
|
+
|
|
+# Old name:
|
|
+AU_ALIAS([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH])
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [])
|
|
+
|
|
+
|
|
+# _LT_CHECK_DLPREOPEN
|
|
+# -------------------
|
|
+m4_defun([_LT_CHECK_DLPREOPEN],
|
|
+[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
|
|
+AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
|
|
+ [libltdl_cv_preloaded_symbols],
|
|
+ [if test -n "$lt_cv_sys_global_symbol_pipe"; then
|
|
+ libltdl_cv_preloaded_symbols=yes
|
|
+ else
|
|
+ libltdl_cv_preloaded_symbols=no
|
|
+ fi
|
|
+ ])
|
|
+if test x"$libltdl_cv_preloaded_symbols" = xyes; then
|
|
+ AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1],
|
|
+ [Define if libtool can extract symbol lists from object files.])
|
|
+fi
|
|
+])# _LT_CHECK_DLPREOPEN
|
|
+
|
|
+
|
|
+# LT_LIB_DLLOAD
|
|
+# -------------
|
|
+AC_DEFUN([LT_LIB_DLLOAD],
|
|
+[m4_pattern_allow([^LT_DLLOADERS$])
|
|
+LT_DLLOADERS=
|
|
+AC_SUBST([LT_DLLOADERS])
|
|
+
|
|
+AC_LANG_PUSH([C])
|
|
+
|
|
+LIBADD_DLOPEN=
|
|
+AC_SEARCH_LIBS([dlopen], [dl],
|
|
+ [AC_DEFINE([HAVE_LIBDL], [1],
|
|
+ [Define if you have the libdl library or equivalent.])
|
|
+ if test "$ac_cv_search_dlopen" != "none required" ; then
|
|
+ LIBADD_DLOPEN="-ldl"
|
|
+ fi
|
|
+ libltdl_cv_lib_dl_dlopen="yes"
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
|
|
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H
|
|
+# include <dlfcn.h>
|
|
+#endif
|
|
+ ]], [[dlopen(0, 0);]])],
|
|
+ [AC_DEFINE([HAVE_LIBDL], [1],
|
|
+ [Define if you have the libdl library or equivalent.])
|
|
+ libltdl_cv_func_dlopen="yes"
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
|
|
+ [AC_CHECK_LIB([svld], [dlopen],
|
|
+ [AC_DEFINE([HAVE_LIBDL], [1],
|
|
+ [Define if you have the libdl library or equivalent.])
|
|
+ LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])])
|
|
+if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
|
|
+then
|
|
+ lt_save_LIBS="$LIBS"
|
|
+ LIBS="$LIBS $LIBADD_DLOPEN"
|
|
+ AC_CHECK_FUNCS([dlerror])
|
|
+ LIBS="$lt_save_LIBS"
|
|
+fi
|
|
+AC_SUBST([LIBADD_DLOPEN])
|
|
+
|
|
+LIBADD_SHL_LOAD=
|
|
+AC_CHECK_FUNC([shl_load],
|
|
+ [AC_DEFINE([HAVE_SHL_LOAD], [1],
|
|
+ [Define if you have the shl_load function.])
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"],
|
|
+ [AC_CHECK_LIB([dld], [shl_load],
|
|
+ [AC_DEFINE([HAVE_SHL_LOAD], [1],
|
|
+ [Define if you have the shl_load function.])
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
|
|
+ LIBADD_SHL_LOAD="-ldld"])])
|
|
+AC_SUBST([LIBADD_SHL_LOAD])
|
|
+
|
|
+case $host_os in
|
|
+darwin[[1567]].*)
|
|
+# We only want this for pre-Mac OS X 10.4.
|
|
+ AC_CHECK_FUNC([_dyld_func_lookup],
|
|
+ [AC_DEFINE([HAVE_DYLD], [1],
|
|
+ [Define if you have the _dyld_func_lookup function.])
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"])
|
|
+ ;;
|
|
+beos*)
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
|
|
+ ;;
|
|
+cygwin* | mingw* | os2* | pw32*)
|
|
+ AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
|
|
+ ;;
|
|
+esac
|
|
+
|
|
+AC_CHECK_LIB([dld], [dld_link],
|
|
+ [AC_DEFINE([HAVE_DLD], [1],
|
|
+ [Define if you have the GNU dld library.])
|
|
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"])
|
|
+AC_SUBST([LIBADD_DLD_LINK])
|
|
+
|
|
+m4_pattern_allow([^LT_DLPREOPEN$])
|
|
+LT_DLPREOPEN=
|
|
+if test -n "$LT_DLLOADERS"
|
|
+then
|
|
+ for lt_loader in $LT_DLLOADERS; do
|
|
+ LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
|
|
+ done
|
|
+ AC_DEFINE([HAVE_LIBDLLOADER], [1],
|
|
+ [Define if libdlloader will be built on this platform])
|
|
+fi
|
|
+AC_SUBST([LT_DLPREOPEN])
|
|
+
|
|
+dnl This isn't used anymore, but set it for backwards compatibility
|
|
+LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
|
|
+AC_SUBST([LIBADD_DL])
|
|
+
|
|
+AC_LANG_POP
|
|
+])# LT_LIB_DLLOAD
|
|
+
|
|
+# Old name:
|
|
+AU_ALIAS([AC_LTDL_DLLIB], [LT_LIB_DLLOAD])
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LTDL_DLLIB], [])
|
|
+
|
|
+
|
|
+# LT_SYS_SYMBOL_USCORE
|
|
+# --------------------
|
|
+# does the compiler prefix global symbols with an underscore?
|
|
+AC_DEFUN([LT_SYS_SYMBOL_USCORE],
|
|
+[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
|
|
+AC_CACHE_CHECK([for _ prefix in compiled symbols],
|
|
+ [lt_cv_sys_symbol_underscore],
|
|
+ [lt_cv_sys_symbol_underscore=no
|
|
+ cat > conftest.$ac_ext <<_LT_EOF
|
|
+void nm_test_func(){}
|
|
+int main(){nm_test_func;return 0;}
|
|
+_LT_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 \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
|
|
+ # See whether the symbols have a leading underscore.
|
|
+ if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
|
|
+ lt_cv_sys_symbol_underscore=yes
|
|
+ else
|
|
+ if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
|
|
+ :
|
|
+ else
|
|
+ echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD
|
|
+ fi
|
|
+ fi
|
|
+ else
|
|
+ echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
|
|
+ fi
|
|
+ else
|
|
+ echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
|
|
+ cat conftest.c >&AS_MESSAGE_LOG_FD
|
|
+ fi
|
|
+ rm -rf conftest*
|
|
+ ])
|
|
+ sys_symbol_underscore=$lt_cv_sys_symbol_underscore
|
|
+ AC_SUBST([sys_symbol_underscore])
|
|
+])# LT_SYS_SYMBOL_USCORE
|
|
+
|
|
+# Old name:
|
|
+AU_ALIAS([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE])
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [])
|
|
+
|
|
+
|
|
+# LT_FUNC_DLSYM_USCORE
|
|
+# --------------------
|
|
+AC_DEFUN([LT_FUNC_DLSYM_USCORE],
|
|
+[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
|
|
+if test x"$lt_cv_sys_symbol_underscore" = xyes; then
|
|
+ if test x"$libltdl_cv_func_dlopen" = xyes ||
|
|
+ test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
|
|
+ AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
|
|
+ [libltdl_cv_need_uscore],
|
|
+ [libltdl_cv_need_uscore=unknown
|
|
+ save_LIBS="$LIBS"
|
|
+ LIBS="$LIBS $LIBADD_DLOPEN"
|
|
+ _LT_TRY_DLOPEN_SELF(
|
|
+ [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes],
|
|
+ [], [libltdl_cv_need_uscore=cross])
|
|
+ LIBS="$save_LIBS"
|
|
+ ])
|
|
+ fi
|
|
+fi
|
|
+
|
|
+if test x"$libltdl_cv_need_uscore" = xyes; then
|
|
+ AC_DEFINE([NEED_USCORE], [1],
|
|
+ [Define if dlsym() requires a leading underscore in symbol names.])
|
|
+fi
|
|
+])# LT_FUNC_DLSYM_USCORE
|
|
+
|
|
+# Old name:
|
|
+AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE])
|
|
+dnl aclocal-1.4 backwards compatibility:
|
|
+dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], [])
|
|
+
|
|
# Helper functions for option handling. -*- Autoconf -*-
|
|
#
|
|
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
|
|
Index: libffi/configure
|
|
===================================================================
|
|
--- libffi.orig/configure
|
|
+++ libffi/configure
|
|
@@ -795,6 +795,7 @@ FFI_DEBUG_FALSE
|
|
FFI_DEBUG_TRUE
|
|
TARGETDIR
|
|
TARGET
|
|
+sys_symbol_underscore
|
|
HAVE_LONG_DOUBLE
|
|
ALLOCA
|
|
PA64_HPUX_FALSE
|
|
@@ -4782,13 +4783,13 @@ if test "${lt_cv_nm_interface+set}" = se
|
|
else
|
|
lt_cv_nm_interface="BSD nm"
|
|
echo "int some_variable = 0;" > conftest.$ac_ext
|
|
- (eval echo "\"\$as_me:4785: $ac_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:4786: $ac_compile\"" >&5)
|
|
(eval "$ac_compile" 2>conftest.err)
|
|
cat conftest.err >&5
|
|
- (eval echo "\"\$as_me:4788: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
+ (eval echo "\"\$as_me:4789: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
|
cat conftest.err >&5
|
|
- (eval echo "\"\$as_me:4791: output\"" >&5)
|
|
+ (eval echo "\"\$as_me:4792: output\"" >&5)
|
|
cat conftest.out >&5
|
|
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
|
lt_cv_nm_interface="MS dumpbin"
|
|
@@ -5994,7 +5995,7 @@ ia64-*-hpux*)
|
|
;;
|
|
*-*-irix6*)
|
|
# Find out which ABI we are using.
|
|
- echo '#line 5997 "configure"' > conftest.$ac_ext
|
|
+ echo '#line 5998 "configure"' > conftest.$ac_ext
|
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
@@ -7847,11 +7848,11 @@ else
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:7850: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:7851: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>conftest.err)
|
|
ac_status=$?
|
|
cat conftest.err >&5
|
|
- echo "$as_me:7854: \$? = $ac_status" >&5
|
|
+ echo "$as_me:7855: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
# So say no if there are warnings other than the usual output.
|
|
@@ -8186,11 +8187,11 @@ else
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:8189: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:8190: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>conftest.err)
|
|
ac_status=$?
|
|
cat conftest.err >&5
|
|
- echo "$as_me:8193: \$? = $ac_status" >&5
|
|
+ echo "$as_me:8194: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
# So say no if there are warnings other than the usual output.
|
|
@@ -8291,11 +8292,11 @@ else
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:8294: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:8295: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>out/conftest.err)
|
|
ac_status=$?
|
|
cat out/conftest.err >&5
|
|
- echo "$as_me:8298: \$? = $ac_status" >&5
|
|
+ echo "$as_me:8299: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
@@ -8346,11 +8347,11 @@ else
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:8349: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:8350: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>out/conftest.err)
|
|
ac_status=$?
|
|
cat out/conftest.err >&5
|
|
- echo "$as_me:8353: \$? = $ac_status" >&5
|
|
+ echo "$as_me:8354: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
@@ -11149,7 +11150,7 @@ else
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 11152 "configure"
|
|
+#line 11153 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -11245,7 +11246,7 @@ else
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 11248 "configure"
|
|
+#line 11249 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -14647,6 +14648,63 @@ _ACEOF
|
|
fi
|
|
fi
|
|
|
|
+if test x$TARGET = xX86_WIN64; then
|
|
+ { $as_echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
|
|
+$as_echo_n "checking for _ prefix in compiled symbols... " >&6; }
|
|
+if test "${lt_cv_sys_symbol_underscore+set}" = set; then
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ lt_cv_sys_symbol_underscore=no
|
|
+ cat > conftest.$ac_ext <<_LT_EOF
|
|
+void nm_test_func(){}
|
|
+int main(){nm_test_func;return 0;}
|
|
+_LT_EOF
|
|
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
+ (eval $ac_compile) 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); }; then
|
|
+ # Now try to grab the symbols.
|
|
+ ac_nlist=conftest.nm
|
|
+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
|
|
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
|
|
+ ac_status=$?
|
|
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } && test -s "$ac_nlist"; then
|
|
+ # See whether the symbols have a leading underscore.
|
|
+ if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
|
|
+ lt_cv_sys_symbol_underscore=yes
|
|
+ else
|
|
+ if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
|
|
+ :
|
|
+ else
|
|
+ echo "configure: cannot find nm_test_func in $ac_nlist" >&5
|
|
+ fi
|
|
+ fi
|
|
+ else
|
|
+ echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&5
|
|
+ fi
|
|
+ else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.c >&5
|
|
+ fi
|
|
+ rm -rf conftest*
|
|
+
|
|
+fi
|
|
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_sys_symbol_underscore" >&5
|
|
+$as_echo "$lt_cv_sys_symbol_underscore" >&6; }
|
|
+ sys_symbol_underscore=$lt_cv_sys_symbol_underscore
|
|
+
|
|
+
|
|
+ if test "x$sys_symbol_underscore" = xyes; then
|
|
+
|
|
+cat >>confdefs.h <<\_ACEOF
|
|
+#define SYMBOL_UNDERSCORE 1
|
|
+_ACEOF
|
|
+
|
|
+ fi
|
|
+fi
|
|
+
|
|
case "$target" in
|
|
*-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
|
|
|