apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: apr-util configure.in Makefile.in
Date Fri, 31 Aug 2001 09:47:54 GMT
dreid       01/08/31 02:47:53

  Modified:    srclib   Makefile.in
               .        configure.in Makefile.in
  Log:
  With my normal sense of missing the boat :)
  
  This gets the build working on BeOS again :)  Apologies for the delay :(
  
  Jeff changed the order of apr-util and apr to solve a "cleaning" issue but
  that makes me uncomfortable as apr-util is dependant on apr, so if we clean
  apr-util we shouldn't be altering anything in apr.  If I decide to rebuild
  apr-util then apr should still be buildable.  Sorry Jeff but I think we need
  a different solution :(
  
  Submitted by:	Peter Schultz <pete@beforever.com>
  
  Revision  Changes    Path
  1.11      +1 -1      httpd-2.0/srclib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	2001/07/31 12:19:55	1.10
  +++ Makefile.in	2001/08/31 09:47:53	1.11
  @@ -1,4 +1,4 @@
   
  -SUBDIRS = apr-util apr $(AP_LIB_DIRS) pcre
  +SUBDIRS = apr apr-util $(AP_LIB_DIRS) pcre
   
   include $(top_srcdir)/build/rules.mk
  
  
  
  1.34      +7 -8      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- configure.in	2001/08/24 03:18:54	1.33
  +++ configure.in	2001/08/31 09:47:53	1.34
  @@ -60,21 +60,20 @@
   AC_SUBST(so_ext)
   AC_SUBST(lib_target)
   
  -LDFLAGS=""
  -EXPAT_LINK=""
  +EXTRA_OS_LINK=""
  +host_alias=`uname -s`
   case "$host_alias" in
  -*beos*)
  +*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"
  +    # if we're building on BeOS then we need to add in the
  +    # apr and expat libraries to the build...  Grrrr...
  +    EXTRA_OS_LINK="$APR_SOURCE_DIR/libapr.la $top_builddir/xml/expat/lib/libexpat.la"
       ;;
   *)
       ;;
   esac
   
  -AC_SUBST(EXPAT_LINK)
  +AC_SUBST(EXTRA_OS_LINK)
   
   dnl
   dnl Prep all the flags and stuff for compilation and export to other builds
  
  
  
  1.45      +1 -1      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Makefile.in	2001/08/24 08:05:30	1.44
  +++ Makefile.in	2001/08/31 09:47:53	1.45
  @@ -50,7 +50,7 @@
   
   $(TARGET_LIB):
   	@objects="`find $(SUBDIRS) -name expat -prune -o -name '*.@so_ext@' -print`"; \
  -	    $(LINK) @lib_target@ @EXPAT_LINK@
  +	    $(LINK) @lib_target@ @EXTRA_OS_LINK@
   
   delete-exports:
   	@if test -f $(TARGET_EXPORTS); then \
  
  
  

Mime
View raw message