Commit 010d1227 authored by Victor J. Orlikowski's avatar Victor J. Orlikowski
Browse files

Changes to get AIX DSOs working, sans APR changes. 

Basically, this allows linker flags to be passed for the httpd executable
and DSOs only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88655 13f79535-47bb-0310-9956-ffa450edef68
parent 0e8fe250

Makefile.in

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ SUBDIRS = srclib os server modules support 


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

acinclude.m4

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 
  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)

build/rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@ 
# 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

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ fi 
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"

      ;;