-# relocatable.m4 serial 12
-dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
+# relocatable.m4 serial 18
+dnl Copyright (C) 2003, 2005-2007, 2009-2014 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.
[
AC_REQUIRE([gl_RELOCATABLE_BODY])
gl_RELOCATABLE_LIBRARY
- if test $RELOCATABLE = yes; then
- AC_LIBOBJ([progreloc])
- fi
: ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
is_noop=no
use_elf_origin_trick=no
+ use_wrapper=no
if test $RELOCATABLE = yes; then
# --enable-relocatable implies --disable-rpath
enable_rpath=no
AC_CHECK_FUNCS([_NSGetExecutablePath])
case "$host_os" in
mingw*) is_noop=yes ;;
- linux*) use_elf_origin_trick=yes ;;
+ linux* | kfreebsd*) use_elf_origin_trick=yes ;;
esac
if test $is_noop = yes; then
RELOCATABLE_LDFLAGS=:
RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
AC_SUBST([RELOCATABLE_LDFLAGS])
else
+ use_wrapper=yes
dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
dnl consisting of more than one word - libtool doesn't support this.
dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
dnl 'install-strip' target.
- INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
+ INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
AC_SUBST([INSTALL_PROGRAM_ENV])
case "$ac_aux_dir" in
/*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
fi
AM_CONDITIONAL([RELOCATABLE_VIA_LD],
[test $is_noop = yes || test $use_elf_origin_trick = yes])
+ AM_CONDITIONAL([RELOCATABLE_VIA_WRAPPER], [test $use_wrapper = yes])
dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty.
AC_SUBST([RELOCATABLE_LIBRARY_PATH])
+
AC_SUBST([RELOCATABLE_CONFIG_H_DIR])
AC_SUBST([RELOCATABLE_SRC_DIR])
AC_SUBST([RELOCATABLE_BUILD_DIR])
+
+ dnl Ensure RELOCATABLE_STRIP is defined in Makefiles (at least those
+ dnl generated by automake), with value ':'.
+ RELOCATABLE_STRIP=':'
+ AC_SUBST([RELOCATABLE_STRIP])
])
dnl Determine the platform dependent parameters needed to use relocatability:
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $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 path variable], acl_cv_libpath, [
+ AC_CACHE_CHECK([for shared library path variable], [acl_cv_libpath], [
LD="$LD" \
${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.libpath" "$host" > conftest.sh
. ./conftest.sh