gstein 2002/08/29 10:56:52
Modified: . Makefile.in apr-config.in configure.in
test Makefile.in
Log:
Fix the result of "apr-config --link-ld --libs". It did not include
the "-0" suffix on the lib name.
- Remove "lib" prefix from APR_LIBNAME definition.
- Determine ld-style library name from APR_LIBNAME for correct suffix.
Submitted by: Scott Lamb <[EMAIL PROTECTED]>
Revision Changes Path
1.83 +2 -2 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- Makefile.in 22 Aug 2002 20:34:16 -0000 1.82
+++ Makefile.in 29 Aug 2002 17:56:52 -0000 1.83
@@ -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/' >> $@
1.23 +5 -5 apr/apr-config.in
Index: apr-config.in
===================================================================
RCS file: /home/cvs/apr/apr-config.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apr-config.in 19 Aug 2002 06:33:09 -0000 1.22
+++ apr-config.in 29 Aug 2002 17:56:52 -0000 1.23
@@ -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
1.480 +1 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- configure.in 22 Aug 2002 20:34:16 -0000 1.479
+++ configure.in 29 Aug 2002 17:56:52 -0000 1.480
@@ -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
1.89 +1 -1 apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Makefile.in 14 Aug 2002 17:15:15 -0000 1.88
+++ Makefile.in 29 Aug 2002 17:56:52 -0000 1.89
@@ -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
