You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2001/08/01 22:37:03 UTC
cvs commit: apr APRVARS.in configure.in
jerenkrantz 01/08/01 13:37:03
Modified: . APRVARS.in configure.in
Log:
Add ALL_LIBS to the link command for APR since LINK is used for building
the test programs in apr-util.
Export the so_ext and lib_target macros via APRVARS. This is needed in
the Makefiles for apr-util. (lib_target needs to be escaped.)
Revision Changes Path
1.10 +3 -0 apr/APRVARS.in
Index: APRVARS.in
===================================================================
RCS file: /home/cvs/apr/APRVARS.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- APRVARS.in 2001/07/09 02:30:43 1.9
+++ APRVARS.in 2001/08/01 20:37:03 1.10
@@ -8,3 +8,6 @@
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
LIBTOOL_LIBS="@LIBTOOL_LIBS@"
APR_SOURCE_DIR="@abs_srcdir@"
+APR_SO_EXT="@so_ext@"
+APR_LIB_TARGET="@export_lib_target@"
+
1.351 +4 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- configure.in 2001/07/31 02:10:10 1.350
+++ configure.in 2001/08/01 20:37:03 1.351
@@ -111,20 +111,23 @@
if test "x$use_libtool" = "xyes"; then
lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@'
- link='$(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) $(ALL_LDFLAGS) -o $@'
+ link='$(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) $(ALL_LDFLAGS) $(ALL_LIBS) -o $@'
so_ext='lo'
lib_target='-rpath $(libdir) $$objects'
+ export_lib_target='-rpath $(libdir) \$\$objects'
else
lt_compile='$(COMPILE) -c $<'
link='$(AR) cr $(TARGET_LIB) $$objects; $(RANLIB) $(TARGET_LIB)'
so_ext='o'
lib_target=''
+ export_lib_target=''
fi
AC_SUBST(lt_compile)
AC_SUBST(link)
AC_SUBST(so_ext)
AC_SUBST(lib_target)
+AC_SUBST(export_lib_target)
AC_SUBST(LTFLAGS)
AC_SUBST(LT_LDFLAGS)