progreloc.c is compiled always, even when --enable-relocatable is not
specified. This is pointless. I'm fixing this:
2007-03-04 Bruno Haible <[EMAIL PROTECTED]>
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.
*** m4/relocatable.m4 4 Mar 2007 15:33:48 -0000 1.4
--- m4/relocatable.m4 4 Mar 2007 21:02:16 -0000
***************
*** 1,4 ****
! # relocatable.m4 serial 10
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,
--- 1,4 ----
! # 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,19 ****
--- 14,22 ----
[
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"
*** modules/relocatable-prog 4 Mar 2007 15:33:48 -0000 1.3
--- modules/relocatable-prog 4 Mar 2007 21:02:16 -0000
***************
*** 26,32 ****
Makefile.am:
DEFS += -DEXEEXT=\"$(EXEEXT)\"
- lib_SOURCES += progreloc.c
Include:
#include "relocatable.h"
--- 26,31 ----
