You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by or...@apache.org on 2001/04/02 21:06:03 UTC
cvs commit: httpd-2.0/build rules.mk
orlikowski 01/04/02 12:06:02
Modified: . Makefile.in acinclude.m4 configure.in
build rules.mk
Log:
Changes to get AIX DSOs working, sans APR changes.
Basically, this allows linker flags to be passed for the httpd executable
and DSOs only.
Revision Changes Path
1.63 +2 -1 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile.in 2001/04/02 15:20:45 1.62
+++ Makefile.in 2001/04/02 19:05:59 1.63
@@ -3,7 +3,8 @@
PROGRAM_NAME = $(progname)
PROGRAM_SOURCES = modules.c
-PROGRAM_LDADD = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
+PROGRAM_LDADD = $(EXTRA_LDFLAGS) $(HTTPD_LDFLAGS) \
+ $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
PROGRAM_DEPENDENCIES = \
$(BUILTIN_LIBS) \
$(MPM_LIB) \
1.73 +2 -0 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- acinclude.m4 2001/04/02 16:15:31 1.72
+++ acinclude.m4 2001/04/02 19:05:59 1.73
@@ -79,6 +79,8 @@
APACHE_SUBST(CXXFLAGS)
APACHE_SUBST(LTFLAGS)
APACHE_SUBST(LDFLAGS)
+ APACHE_SUBST(SH_LDFLAGS)
+ APACHE_SUBST(HTTPD_LDFLAGS)
APACHE_SUBST(DEFS)
APACHE_SUBST(LIBTOOL)
APACHE_SUBST(SHELL)
1.137 +4 -0 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- configure.in 2001/04/02 15:20:45 1.136
+++ configure.in 2001/04/02 19:06:00 1.137
@@ -183,6 +183,10 @@
if test "$apache_need_shared" = "yes"; then
$SHELL $ac_aux_dir/ltconfig --output=shlibtool --disable-static --srcdir=$ac_aux_dir --cache-file=./config.cache $ac_aux_dir/ltmain.sh
case $PLATFORM in
+ *-ibm-aix*)
+ HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-bE:$abs_srcdir/support/httpd.exp"
+ SH_LDFLAGS="$SH_LDFLAGS -Wl,-bI:$abs_srcdir/support/httpd.exp"
+ ;;
*os390)
CFLAGS="$CFLAGS -Wc,DLL,EXPORTALL"
;;
1.46 +1 -1 httpd-2.0/build/rules.mk
Index: rules.mk
===================================================================
RCS file: /home/cvs/httpd-2.0/build/rules.mk,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- rules.mk 2001/04/02 15:20:45 1.45
+++ rules.mk 2001/04/02 19:06:02 1.46
@@ -71,7 +71,7 @@
# Link-related commands
LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@
-SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(CORE_IMPLIB) -o $@
+SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) -o $@
MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@
# Cross compile commands