[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
relocatable-lib fix
From: |
Bruno Haible |
Subject: |
relocatable-lib fix |
Date: |
Sat, 3 Mar 2007 18:48:57 +0100 |
User-agent: |
KMail/1.5.4 |
The module relocatable-lib includes relocatable.h, which uses
ENABLE_RELOCATABLE. So it needs to be defined in m4/relocatable-lib.m4.
2007-03-03 Bruno Haible <address@hidden>
* m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY): Define
ENABLE_RELOCATABLE here.
* m4/relocatable.m4 (gl_RELOCATABLE_BODY): Don't define it here.
--- m4/relocatable-lib.m4 1 Mar 2007 02:14:05 -0000 1.1
+++ m4/relocatable-lib.m4 3 Mar 2007 17:45:19 -0000
@@ -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 @@
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.
--- m4/relocatable.m4 1 Mar 2007 02:14:05 -0000 1.2
+++ m4/relocatable.m4 3 Mar 2007 17:45:19 -0000
@@ -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 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- relocatable-lib fix,
Bruno Haible <=