From cc4da6d6a9d6824bd5f3d4fdd21e7c80a24d6042 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Wed, 26 Jul 2017 15:23:29 +0100 Subject: [PATCH 5/5] relocatable-lib{,-lgpl}: make ENABLE_COSTLY_RELOCATABLE the default * lib/relocatable.c: Define ENABLE_COSTLY_RELOCATABLE to 1 if undefined. * modules/relocatable-lib: Mention that it can be defined to 0. * modules/relocatable-lib-lgpl: Likewise. --- ChangeLog | 7 +++++++ lib/relocatable.c | 10 ++-------- modules/relocatable-lib | 2 +- modules/relocatable-lib-lgpl | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f0b993..94d0888 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2017-07-26 Reuben Thomas + relocatable-lib{,-lgpl}: make ENABLE_COSTLY_RELOCATABLE the default + * lib/relocatable.c: Define ENABLE_COSTLY_RELOCATABLE to 1 if undefined. + * modules/relocatable-lib: Mention that it can be defined to 0. + * modules/relocatable-lib-lgpl: Likewise. + +2017-07-26 Reuben Thomas + Change default for relocatable modules to --enable-relocatable * m4/relocatable.m4: Change --enable-relocatable to --disable-relocatable. diff --git a/lib/relocatable.c b/lib/relocatable.c index 0892e3a..9429557 100644 --- a/lib/relocatable.c +++ b/lib/relocatable.c @@ -95,15 +95,9 @@ /* Whether to enable the more costly support for relocatable libraries. It allows libraries to be have been installed with a different original - prefix than the program. But it is quite costly, especially on Cygwin - platforms, see below. Therefore we enable it by default only on native - Windows platforms. */ + prefix than the program. */ #ifndef ENABLE_COSTLY_RELOCATABLE -# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -# define ENABLE_COSTLY_RELOCATABLE 1 -# else -# define ENABLE_COSTLY_RELOCATABLE 0 -# endif +# define ENABLE_COSTLY_RELOCATABLE 1 #endif /* Original installation prefix. */ diff --git a/modules/relocatable-lib b/modules/relocatable-lib index 9a4d069..fb43261 100644 --- a/modules/relocatable-lib +++ b/modules/relocatable-lib @@ -22,7 +22,7 @@ AC_CONFIG_LIBOBJ_DIR([lib]) Makefile.am: @item -foo_CPPFLAGS = -DINSTALLDIR=\"$(bindir)\" -DIN_LIBRARY # optionally, -DENABLE_COSTLY_RELOCATABLE +foo_CPPFLAGS = -DINSTALLDIR=\"$(bindir)\" -DIN_LIBRARY # optionally, -DENABLE_COSTLY_RELOCATABLE=0 foo_LIBADD = $(LIBOBJS) # or $(LTLIBOBJS) if using libtool if RELOCATABLE_VIA_LD foo_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)` diff --git a/modules/relocatable-lib-lgpl b/modules/relocatable-lib-lgpl index 54dbe69..80abb30 100644 --- a/modules/relocatable-lib-lgpl +++ b/modules/relocatable-lib-lgpl @@ -21,7 +21,7 @@ AC_CONFIG_LIBOBJ_DIR([lib]) Makefile.am: DEFS += -DNO_XMALLOC -foo_CPPFLAGS = -DINSTALLDIR=\"$(bindir)\" -DIN_LIBRARY # optionally, -DENABLE_COSTLY_RELOCATABLE +foo_CPPFLAGS = -DINSTALLDIR=\"$(bindir)\" -DIN_LIBRARY # optionally, -DENABLE_COSTLY_RELOCATABLE=0 foo_LIBADD = $(LIBOBJS) # or $(LTLIBOBJS) if using libtool Include: -- 2.7.4