Greg Stein wrote:
I've uploaded a site structure to http://www.apache.org/dist/apr/ and also
uploaded some 0.9.0 source tarballs/zipballs. (signed, blah blah)

Since this is our first "formalized" release, could somebody at least take a
look around and make any tweaks or suggestions? Before putting an
announcement at Freshmeat or [EMAIL PROTECTED] or whatever, it would be
nice to at least get some validation of our release management setup.

IOW, it looks fine to me, but I don't trust it yet :-)

Here's one problem: "apr-config --link-ld --libs" is still broken with layout apr - it returns -lapr instead of -lapr-0. Patch attached. I couldn't use APR_LIBNAME as is because it has a lib prefix. I stripped it out in the definition; seemed the most clean thing to do.


--
Scott Lamb
- Remove "lib" prefix from APR_LIBNAME definition.
- Determine ld-style library name from APR_LIBNAME for correct suffix.

Index: Makefile.in
===================================================================
RCS file: /home/cvspublic/apr/Makefile.in,v
retrieving revision 1.82
diff -u -r1.82 Makefile.in
--- Makefile.in 22 Aug 2002 20:34:16 -0000      1.82
+++ Makefile.in 29 Aug 2002 02:02:55 -0000
@@ -20,7 +20,7 @@
 CLEAN_SUBDIRS= . test build
 [EMAIL PROTECTED]@
 
-TARGET_LIB = @[EMAIL PROTECTED]
+TARGET_LIB = [EMAIL PROTECTED]@.la
 
 #
 # Rules for building specific targets, starting with 'all' for
@@ -118,7 +118,7 @@
        $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@
 
 apr.exp: exports.c export_vars.h
-       @echo "#! @[EMAIL PROTECTED]" > $@
+       @echo "#! [EMAIL PROTECTED]@.so" > $@
        @echo "* This file was AUTOGENERATED at build time." >> $@
        @echo "* Please do not edit by hand." >> $@
        $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | 
sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
Index: apr-config.in
===================================================================
RCS file: /home/cvspublic/apr/apr-config.in,v
retrieving revision 1.22
diff -u -r1.22 apr-config.in
--- apr-config.in       19 Aug 2002 06:33:09 -0000      1.22
+++ apr-config.in       29 Aug 2002 02:02:55 -0000
@@ -134,9 +134,9 @@
 fi
 
 if test "$location" = "installed"; then
-    LA_FILE="$libdir/${APR_LIBNAME}.la"
+    LA_FILE="$libdir/lib${APR_LIBNAME}.la"
 else
-    LA_FILE="$thisdir/${APR_LIBNAME}.la"
+    LA_FILE="$thisdir/lib${APR_LIBNAME}.la"
 fi
 
 flags=""
@@ -189,9 +189,9 @@
     --link-ld)
     if test "$location" = "installed"; then
         ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -lapr"
+        flags="$flags -L$libdir -l${APR_LIBNAME}"
     else
-        flags="$flags -L$thisdir -lapr"
+        flags="$flags -L$thisdir -l${APR_LIBNAME}"
     fi
     ;;
     --link-libtool)
@@ -203,7 +203,7 @@
         flags="$flags $LA_FILE"
     elif test "$location" = "installed"; then
         ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -lapr"
+        flags="$flags -L$libdir -l${APR_LIBNAME}"
     else
         flags="$flags $LA_FILE"
     fi
Index: configure.in
===================================================================
RCS file: /home/cvspublic/apr/configure.in,v
retrieving revision 1.479
diff -u -r1.479 configure.in
--- configure.in        22 Aug 2002 20:34:16 -0000      1.479
+++ configure.in        29 Aug 2002 02:02:56 -0000
@@ -122,7 +122,7 @@
 APR_EBCDIC
 
 dnl this is our library name
-APR_LIBNAME="libapr${libsuffix}"
+APR_LIBNAME="apr${libsuffix}"
 AC_SUBST(APR_LIBNAME)
 
 dnl prep libtool
Index: test/Makefile.in
===================================================================
RCS file: /home/cvspublic/apr/test/Makefile.in,v
retrieving revision 1.88
diff -u -r1.88 Makefile.in
--- test/Makefile.in    14 Aug 2002 17:15:15 -0000      1.88
+++ test/Makefile.in    29 Aug 2002 02:02:57 -0000
@@ -52,7 +52,7 @@
 # bring in rules.mk for standard functionality
 @INCLUDE_RULES@
 
-LOCAL_LIBS=../@[EMAIL PROTECTED]
+LOCAL_LIBS=../[EMAIL PROTECTED]@.la
 
 CLEAN_TARGETS = testfile.tmp [EMAIL PROTECTED]@ mod_test.slo
 

Reply via email to