From: Bruno Haible <bruno@clisp.org>
Date: Sat, 3 Mar 2007 17:49:27 +0000 (+0000)
Subject: Define ENABLE_RELOCATABLE also for libraries.
X-Git-Tag: cvs-readonly~917
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=a5f3d7882be93b0dd5244e8e2cfb06ef1094c981;p=gnulib.git

Define ENABLE_RELOCATABLE also for libraries.
---

diff --git a/ChangeLog b/ChangeLog
index ee690b479..0198f96f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2007-03-02  Bruno Haible  <bruno@clisp.org>
+2007-03-03  Bruno Haible  <bruno@clisp.org>
+
+	* m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY): Define
+	ENABLE_RELOCATABLE here.
+	* m4/relocatable.m4 (gl_RELOCATABLE_BODY): Don't define it here.
+
+2007-03-03  Bruno Haible  <bruno@clisp.org>
 
 	* modules/rbtreehash-list-tests (Depends-on): Add progname.
 	* tests/test-rbtreehash_list.c: Include progname.h.
diff --git a/m4/relocatable-lib.m4 b/m4/relocatable-lib.m4
index 398f5c50f..9f840d967 100644
--- a/m4/relocatable-lib.m4
+++ b/m4/relocatable-lib.m4
@@ -1,5 +1,5 @@
-# relocatable-lib.m4 serial 1
-dnl Copyright (C) 2003, 2005-2006, 2007 Free Software Foundation, Inc.
+# relocatable-lib.m4 serial 2
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,10 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY],
   fi
   AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${reloc_final_prefix}"],
     [Define to the value of ${prefix}, as a string.])
+  if test $RELOCATABLE = yes; then
+    AC_DEFINE([ENABLE_RELOCATABLE], 1,
+      [Define to 1 if the package shall run at any location in the filesystem.])
+  fi
 ])
 
 dnl Support for relocatable packages for which it is a nop.
diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index 624d7a8c9..fc24f79f8 100644
--- a/m4/relocatable.m4
+++ b/m4/relocatable.m4
@@ -1,5 +1,5 @@
-# relocatable.m4 serial 8
-dnl Copyright (C) 2003, 2005-2006, 2007 Free Software Foundation, Inc.
+# relocatable.m4 serial 9
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -38,8 +38,6 @@ AC_DEFUN([gl_RELOCATABLE_BODY],
   if test $RELOCATABLE = yes; then
     # --enable-relocatable implies --disable-rpath
     enable_rpath=no
-    AC_DEFINE([ENABLE_RELOCATABLE], 1,
-      [Define to 1 if the package shall run at any location in the filesystem.])
     AC_CHECK_HEADERS([mach-o/dyld.h])
     AC_CHECK_FUNCS([_NSGetExecutablePath])
     case "$host_os" in