trawick     01/12/12 11:35:06

  Modified:    .        Makefile.in configure.in
               build    apr_hints.m4
  Log:
  switch Apache/apr/apr-util to use run-time linking on AIX
  
  Revision  Changes    Path
  1.67      +1 -1      apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Makefile.in	2001/12/12 09:08:20	1.66
  +++ Makefile.in	2001/12/12 19:35:06	1.67
  @@ -81,7 +81,7 @@
   
   $(TARGET_LIB):
   	@for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \
  -	    tmpcmd="$(LINK) @lib_target@"; \
  +	    tmpcmd="$(LINK) @lib_target@ @lib_target_libs@"; \
   	    echo $$tmpcmd; \
   	    $$tmpcmd
   
  
  
  
  1.388     +11 -0     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.387
  retrieving revision 1.388
  diff -u -r1.387 -r1.388
  --- configure.in	2001/12/12 13:28:17	1.387
  +++ configure.in	2001/12/12 19:35:06	1.388
  @@ -130,6 +130,16 @@
         export_lib_target=''
   fi
   
  +dnl On AIX, libraries need to be specified on the link of lib_target
  +case $host in
  +    *aix*)
  +        lib_target_libs="\$(EXTRA_LIBS)";
  +        ;;
  +    *)
  +        lib_target_libs=""
  +        ;;
  +esac
  +
   AC_SUBST(lt_compile)
   AC_SUBST(link)
   AC_SUBST(so_ext)
  @@ -138,6 +148,7 @@
   AC_SUBST(shlibpath_var)
   AC_SUBST(LTFLAGS)
   AC_SUBST(LT_LDFLAGS)
  +AC_SUBST(lib_target_libs)
   
   dnl #----------------------------- Checks for compiler flags
   nl='
  
  
  
  1.32      +1 -0      apr/build/apr_hints.m4
  
  Index: apr_hints.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_hints.m4,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- apr_hints.m4	2001/12/03 19:26:35	1.31
  +++ apr_hints.m4	2001/12/12 19:35:06	1.32
  @@ -64,6 +64,7 @@
           fi
   	APR_SETIFNULL(apr_iconv_inbuf_const, [1])
   	APR_ADDTO(CPPFLAGS, [-D_THREAD_SAFE])
  +	APR_ADDTO(LDFLAGS, [-Wl,-brtl])
           ;;
       *-apollo-*)
   	APR_ADDTO(CPPFLAGS, [-DAPOLLO])