httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/support Makefile.in
Date Wed, 12 Dec 2001 19:39:55 GMT
trawick     01/12/12 11:39:55

  Modified:    .        acinclude.m4 configure.in
               support  Makefile.in
  Log:
  change Apache/apr/apr-util to use run-time linking on AIX
  
  currently, a kludge (-uXML_Parse) is needed to get a reference to expat
  in the Apache executable programs; I think this is related to the fact
  that expat libtool is getting generated a little differently than apr
  libtool and is choosing to build a different flavor of shared library
  
  Revision  Changes    Path
  1.106     +1 -0      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- acinclude.m4	2001/11/24 15:52:44	1.105
  +++ acinclude.m4	2001/12/12 19:39:54	1.106
  @@ -70,6 +70,7 @@
     APACHE_SUBST(LT_LDFLAGS)
     APACHE_SUBST(SH_LDFLAGS)
     APACHE_SUBST(HTTPD_LDFLAGS)
  +  APACHE_SUBST(UTIL_LDFLAGS)
     APACHE_SUBST(LIBS)
     APACHE_SUBST(DEFS)
     APACHE_SUBST(INCLUDES)
  
  
  
  1.190     +3 -3      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.189
  retrieving revision 1.190
  diff -u -r1.189 -r1.190
  --- configure.in	2001/12/05 17:32:52	1.189
  +++ configure.in	2001/12/12 19:39:54	1.190
  @@ -275,13 +275,13 @@
     shared_build="shared-build"
   fi
   
  -dnl enable_so tells is if *any* modules can be built as DSOs
  +dnl enable_so tells us if *any* modules can be built as DSOs
   
   if test "$enable_so" = "yes"; then
     case $host in
       *-ibm-aix*)
  -      HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-bE:$abs_builddir/server/httpd.exp"
  -      SH_LDFLAGS="$SH_LDFLAGS -Wl,-bI:$abs_builddir/server/httpd.exp -Wl,-bI:$abs_builddir/srclib/apr/apr.exp
-Wl,-bI:$abs_builddir/srclib/apr-util/aprutil.exp"
  +      HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-uXML_Parse -Wl,-bE:$abs_builddir/server/httpd.exp"
  +      UTIL_LDFLAGS="$UTIL_LDFLAGS -Wl,-uXML_Parse"
         ;;
       *beos)
         SH_LDFLAGS='$(top_builddir)/_APP_'
  
  
  
  1.30      +1 -1      httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Makefile.in	2001/11/02 21:49:35	1.29
  +++ Makefile.in	2001/12/12 19:39:55	1.30
  @@ -4,7 +4,7 @@
   PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid
   TARGETS  = $(PROGRAMS)
   
  -PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
  +PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
   PROGRAM_DEPENDENCIES = \
   	$(top_builddir)/srclib/apr-util/libaprutil.la \
   	$(top_builddir)/srclib/apr/libapr.la
  
  
  

Mime
View raw message