jerenkrantz    02/05/14 02:11:31

  Modified:    build    apu-conf.m4
  Log:
  If we're using our bundled expat, we can't (yet) provide -L/-l link
  information because expat won't exist in its final state (i.e. libexpat.so)
  until install time, so we must use .la files for this case no matter what.
  Providing we use library dependencies with libtool-1.4+, this hack should go
  away.
  
  On one hand, it is invalid to use apu-config --libs until we're installed.
  But, since we don't support libtool dependencies yet, httpd-2.0 still needs
  to know the dependencies even though it uses libtool.  Only teaching
  libaprutil.la about its dependencies suitably solves this.
  
  Revision  Changes    Path
  1.41      +5 -1      apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- apu-conf.m4	14 May 2002 08:37:17 -0000	1.40
  +++ apu-conf.m4	14 May 2002 09:11:31 -0000	1.41
  @@ -527,6 +527,7 @@
     expat_libs="-lexpat"
     expat_libtool=$top_builddir/$bundled_subdir/lib/libexpat.la
     APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
  +  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libtool])
   else
   if test "$expat_include_dir" = "$srcdir/xml/expat/include" -o "$expat_include_dir" = "$srcdir/xml/expat/lib"; then
     dnl This is a bit of a hack.  This only works because we know that
  @@ -538,6 +539,10 @@
     expat_libs="-lexpat"
     expat_libtool=$top_builddir/$bundled_subdir/lib/libexpat.la
     APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
  +  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libtool])
  +else
  +  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
  +fi
   fi
   fi
   APR_XML_DIR=$bundled_subdir
  @@ -549,7 +554,6 @@
   if test "$expat_include_dir" != "/usr/include"; then
     APR_ADDTO(APRUTIL_INCLUDES, [-I$expat_include_dir])
   fi
  -APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
   APR_ADDTO(APRUTIL_LDFLAGS, [$expat_ldflags])
   APR_ADDTO(APRUTIL_LIBS, [$expat_libtool])
   ])