diff options
| author | Joe Orton <jorton@apache.org> | 2004-01-19 23:58:41 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2004-01-19 23:58:41 +0100 |
| commit | 722d590399e74970370397d69de149921faf4e9b (patch) | |
| tree | f6a46af9161365e0f67f6844da204948621a03a4 | |
| parent | * server/Makefile.in: Simpler fix to ensure that buildmark.lo is (diff) | |
| download | apache2-722d590399e74970370397d69de149921faf4e9b.tar.xz apache2-722d590399e74970370397d69de149921faf4e9b.zip | |
Correct use of libtool: libtool convenience libraries which are to be
linked directly into a program must be linked using -static and not
-module. Fixes build issues with libtool HEAD.
* acinclude.m4 (APACHE_MODPATH_ADD): For a static module, use a
filename with a lib prefix.
* build/rules.mk.in (MOD_LINK): Use -static not -module.
* build/special.mk (install-modules): Adjust special-case for
installation of shared modules to look for libso.la not mod_so.la.
* build/library.mk: Link libraries using -static.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102381 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | acinclude.m4 | 3 | ||||
| -rw-r--r-- | build/library.mk | 2 | ||||
| -rw-r--r-- | build/rules.mk.in | 2 | ||||
| -rw-r--r-- | build/special.mk | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3c02af532c..8c620e8309 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -170,7 +170,8 @@ AC_DEFUN(APACHE_MODPATH_ADD,[ if test -z "$module_standalone"; then if test -z "$2"; then - libname="mod_$1.la" + # The filename of a convenience library must have a "lib" prefix: + libname="lib$1.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<<EOF diff --git a/build/library.mk b/build/library.mk index 3171723b4e..bcd498f29a 100644 --- a/build/library.mk +++ b/build/library.mk @@ -57,4 +57,4 @@ LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X) $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) - $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) + $(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) diff --git a/build/rules.mk.in b/build/rules.mk.in index 434d7c3c64..343582521f 100644 --- a/build/rules.mk.in +++ b/build/rules.mk.in @@ -83,7 +83,7 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) @LTCFLAGS@ -c $< && to LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ SH_LINK = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ -MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ +MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ # Cross compile commands diff --git a/build/special.mk b/build/special.mk index 7689079f2b..43c279aace 100644 --- a/build/special.mk +++ b/build/special.mk @@ -64,7 +64,7 @@ INSTALL_TARGETS = install-modules install-modules: @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) @builtin='$(BUILTIN_LIBS)'; \ - has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \ + has_mod_so=`echo $$builtin|sed 's/^.*libso.*$$/has_mod_so/'`; \ if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \ list='$(shared)'; \ for i in $$list; do \ |