# HG changeset patch # User Bruno Haible # Date 1173042350 0 # Node ID a601c63691bf6ad40e529b83aea985af2c31d08f # Parent 96afaf6c40a166880b20d6e2b8b39c8eacc1ab30 Compile progreloc.c only if --enable-relocatable is specified. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-03-04 Bruno Haible + + Compile progreloc.c only if --enable-relocatable is specified. + * m4/relocatable.m4 (gl_RELOCATABLE): Arrange to compile progreloc.c + if --enable-relocatable was specified. + * modules/relocatable-prog (Makefile.am): Remove progreloc.c from + lib_SOURCES. + 2007-03-04 Jim Meyering * lib/acl.c (ACL_NOT_WELL_SUPPORTED): New macro. diff --git a/m4/relocatable.m4 b/m4/relocatable.m4 --- a/m4/relocatable.m4 +++ b/m4/relocatable.m4 @@ -1,4 +1,4 @@ -# relocatable.m4 serial 10 +# relocatable.m4 serial 11 dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,6 +14,9 @@ [ 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" diff --git a/modules/relocatable-prog b/modules/relocatable-prog --- a/modules/relocatable-prog +++ b/modules/relocatable-prog @@ -26,7 +26,6 @@ Makefile.am: DEFS += -DEXEEXT=\"$(EXEEXT)\" -lib_SOURCES += progreloc.c Include: #include "relocatable.h"