svn commit: r579264 - in /apr/apr/trunk: Makefile.in configure.in

[jo...@apache.org]

Author: jorton
Date: Tue Sep 25 07:38:00 2007
New Revision: 579264

URL: http://svn.apache.org/viewvc?rev=579264&view=rev
Log:
* configure.in, Makefile.in: Define the libtool versioning hint in the
Makefile rather than hard-coding in the (shared) apr_rules.mk.

Modified:
    apr/apr/trunk/Makefile.in
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=579264&r1=579263&r2=579264&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Tue Sep 25 07:38:00 2007
@@ -38,6 +38,8 @@
 #
 TARGETS = $(TARGET_LIB) apr.exp apr-config.out build/apr_rules.out
 
+LT_VERSION = @LT_VERSION@
+
 # bring in rules.mk for standard functionality
 @INCLUDE_RULES@
 @INCLUDE_OUTPUTS@

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=579264&r1=579263&r2=579264&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue Sep 25 07:38:00 2007
@@ -199,7 +199,7 @@
 if test "x$use_libtool" = "xyes"; then
       lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
       LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
-      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
+      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
       so_ext='lo'
       lib_target='-rpath $(libdir) $(OBJECTS)'
       export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
@@ -227,6 +227,7 @@
 AC_SUBST(shlibpath_var)
 AC_SUBST(LTFLAGS)
 AC_SUBST(LT_LDFLAGS)
+AC_SUBST(LT_VERSION)
 
 dnl ----------------------------- Checks for compiler flags
 nl='