VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-20 16:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct use of libtool: libtool convenience libraries which are to be

Browse Source 
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
This commit is contained in:
Joe Orton
2004-01-19 22:58:41 +00:00
parent 8787f61c2b
commit 722d590399
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acinclude.m4
View File

@ -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

2
build/library.mk
View File

@ -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)

2
build/rules.mk.in
View File

@ -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

2
build/special.mk
View File

@ -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 \