embedaddon/libiconv/srcm4/relocatable.m4 - diff

Return to relocatable.m4 CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srcm4

Diff for /embedaddon/libiconv/srcm4/relocatable.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:49	version 1.1.1.2, 2012/05/29 09:29:44
Line 1	Line 1
# relocatable.m4 serial 14	# relocatable.m4 serial 17
dnl Copyright (C) 2003, 2005-2007, 2009 Free Software Foundation, Inc.	dnl Copyright (C) 2003, 2005-2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation	dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,	dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.	dnl with or without modifications, as long as this notice is preserved.
Line 14 AC_DEFUN([gl_RELOCATABLE],	Line 14 AC_DEFUN([gl_RELOCATABLE],
[	[
AC_REQUIRE([gl_RELOCATABLE_BODY])	AC_REQUIRE([gl_RELOCATABLE_BODY])
gl_RELOCATABLE_LIBRARY	gl_RELOCATABLE_LIBRARY
if test $RELOCATABLE = yes; then
AC_LIBOBJ([progreloc])
fi
: ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}	: ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"	RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"	RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
Line 36 AC_DEFUN([gl_RELOCATABLE_BODY],	Line 33 AC_DEFUN([gl_RELOCATABLE_BODY],
AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])	AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
is_noop=no	is_noop=no
use_elf_origin_trick=no	use_elf_origin_trick=no
	use_wrapper=no
if test $RELOCATABLE = yes; then	if test $RELOCATABLE = yes; then
# --enable-relocatable implies --disable-rpath	# --enable-relocatable implies --disable-rpath
enable_rpath=no	enable_rpath=no
Line 58 AC_DEFUN([gl_RELOCATABLE_BODY],	Line 56 AC_DEFUN([gl_RELOCATABLE_BODY],
RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""	RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\""
AC_SUBST([RELOCATABLE_LDFLAGS])	AC_SUBST([RELOCATABLE_LDFLAGS])
else	else
	use_wrapper=yes
dnl Unfortunately we cannot define INSTALL_PROGRAM to a command	dnl Unfortunately we cannot define INSTALL_PROGRAM to a command
dnl consisting of more than one word - libtool doesn't support this.	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 So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the
Line 73 AC_DEFUN([gl_RELOCATABLE_BODY],	Line 72 AC_DEFUN([gl_RELOCATABLE_BODY],
fi	fi
AM_CONDITIONAL([RELOCATABLE_VIA_LD],	AM_CONDITIONAL([RELOCATABLE_VIA_LD],
[test $is_noop = yes \|\| test $use_elf_origin_trick = yes])	[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.	dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty.
AC_SUBST([RELOCATABLE_LIBRARY_PATH])	AC_SUBST([RELOCATABLE_LIBRARY_PATH])

AC_SUBST([RELOCATABLE_CONFIG_H_DIR])	AC_SUBST([RELOCATABLE_CONFIG_H_DIR])
AC_SUBST([RELOCATABLE_SRC_DIR])	AC_SUBST([RELOCATABLE_SRC_DIR])
AC_SUBST([RELOCATABLE_BUILD_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:	dnl Determine the platform dependent parameters needed to use relocatability:

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2