apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr configure.in Makefile.in
Date Mon, 29 Sep 2003 14:20:02 GMT
jorton      2003/09/29 07:20:02

  Modified:    .        configure.in Makefile.in
  Log:
  Link libapr against the libraries on which it depends for all
  platforms, not just AIX.
  
  PR: 18420
  
  * configure.in: Remove lib_target_libs setting for AIX.
  
  * Makefile.in ($(TARGET_LIB)): Use ALL_LIBS instead of
  configured lib_target_libs value in $(LINK) line.
  
  Revision  Changes    Path
  1.537     +0 -6      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.536
  retrieving revision 1.537
  diff -u -u -r1.536 -r1.537
  --- configure.in	29 Sep 2003 11:31:59 -0000	1.536
  +++ configure.in	29 Sep 2003 14:20:02 -0000	1.537
  @@ -186,12 +186,7 @@
         export_lib_target=''
   fi
   
  -# On AIX, libraries need to be specified on the link of lib_target
  -lib_target_libs=""
   case $host in
  -    *aix*)
  -        lib_target_libs="\$(EXTRA_LIBS)";
  -        ;;
       *-solaris2*)
           apr_platform_runtime_link_flag="-R"
           ;;
  @@ -207,7 +202,6 @@
   AC_SUBST(shlibpath_var)
   AC_SUBST(LTFLAGS)
   AC_SUBST(LT_LDFLAGS)
  -AC_SUBST(lib_target_libs)
   
   dnl ----------------------------- Checks for compiler flags
   nl='
  
  
  
  1.88      +1 -1      apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -u -r1.87 -r1.88
  --- Makefile.in	30 Apr 2003 17:28:25 -0000	1.87
  +++ Makefile.in	29 Sep 2003 14:20:02 -0000	1.88
  @@ -100,7 +100,7 @@
   
   $(TARGET_LIB):
   	@for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \
  -	    tmpcmd="$(LINK) @lib_target@ @lib_target_libs@"; \
  +	    tmpcmd="$(LINK) @lib_target@ $(ALL_LIBS)"; \
   	    echo $$tmpcmd; \
   	    $$tmpcmd && touch $@
   
  
  
  

Mime
View raw message