dreid 01/06/07 18:30:16
Modified: . Makefile.in configure.in
Log:
Now that we have the new libtool that allows us to do shared builds, this
extra hack is needed on beos to get us building again.
Revision Changes Path
1.37 +1 -1 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.in 2001/05/31 04:54:02 1.36
+++ Makefile.in 2001/06/08 01:30:14 1.37
@@ -46,7 +46,7 @@
$(TARGET_LIB):
@objects="`find $(SUBDIRS) -name expat -prune -o -name '[EMAIL
PROTECTED]@' -print`"; \
- $(LINK) @lib_target@
+ $(LINK) @lib_target@ @EXPAT_LINK@
delete-exports:
@if test -f $(TARGET_EXPORTS); then \
1.25 +3 -0 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- configure.in 2001/05/31 04:54:03 1.24
+++ configure.in 2001/06/08 01:30:15 1.25
@@ -42,12 +42,14 @@
AC_CANONICAL_SYSTEM
LDFLAGS=""
+EXPAT_LINK=""
case "$host_alias" in
*beos*)
# Horrible Hack !!!
# if we're building a shared lib then we need to add in the
# apr library to the build...
LDFLAGS="$APR_SOURCE_DIR/libapr.la"
+ EXPAT_LINK="\$(top_builddir)/xml/expat/lib/libexpat.so"
;;
*)
;;
@@ -91,6 +93,7 @@
AC_SUBST(lib_target)
AC_SUBST(LTFLAGS)
AC_SUBST(LT_LDFLAGS)
+AC_SUBST(EXPAT_LINK)
dnl
dnl grab flags from APR.
