From 5477344afc7509ae13c14245f4c29c3eb3388236 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 4 Mar 2007 21:05:50 +0000 Subject: [PATCH] Compile progreloc.c only if --enable-relocatable is specified. --- ChangeLog | 8 ++++++++ m4/relocatable.m4 | 5 ++++- modules/relocatable-prog | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83fb0c5356..b7567bc32e 100644 --- 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 index da14848a12..27f5724a54 100644 --- 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_DEFUN([gl_RELOCATABLE], [ 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 index 6029b7c783..cd9d79eb81 100644 --- a/modules/relocatable-prog +++ b/modules/relocatable-prog @@ -26,7 +26,6 @@ gl_RELOCATABLE([$gl_source_base]) Makefile.am: DEFS += -DEXEEXT=\"$(EXEEXT)\" -lib_SOURCES += progreloc.c Include: #include "relocatable.h" -- 2.30.2