Return-Path: <apache-cvs-owner-apache-cvs-archive=hyperreal.org@apache.org>
Delivered-To: apache-cvs-archive@hyperreal.org
Received: (qmail 4237 invoked by uid 6000); 8 Oct 1999 16:07:50 -0000
Received: (qmail 4145 invoked by uid 2016); 8 Oct 1999 16:07:46 -0000
Delivered-To: apcore-apache-2.0-cvs@apache.org
Received: (qmail 4129 invoked by uid 254); 8 Oct 1999 16:07:42 -0000
Date: 8 Oct 1999 16:07:42 -0000
Message-ID: <19991008160742.4128.qmail@hyperreal.org>
From: dreid@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr configure.in
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

dreid       99/10/08 09:07:41

  Modified:    src/lib/apr configure.in
  Log:
  This allows for more flexability in the directories used by non-unix
  platforms.  Specifically it adds
  - a MODULES variable
  - a DEFAULT_OSDIR which is used when no OSDIR exists for a platform
  It's been tested on BeOS and works OK.  Should have no bearing on
  unix platforms.
  
  Revision  Changes    Path
  1.15      +23 -5     apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- configure.in	1999/10/06 06:48:49	1.14
  +++ configure.in	1999/10/08 16:07:38	1.15
  @@ -2,8 +2,13 @@
   OS=`./config.guess`
   OS=`./config.sub $OS` 
   
  +# These added to allow default directories to be used...
  +DEFAULT_OSDIR="unix"
  +MODULES="file_io network_io threadproc misc signal locks time" 
  +
   echo "Configuring APR library"
   echo "Platform: ${OS}"
  +echo "(Default will be ${DEFAULT_OSDIR})"
   
   dnl Process this file with autoconf to produce a configure script.
   AC_INIT(configure.in)
  @@ -207,10 +212,23 @@
   AC_SUBST(AR)
   AC_SUBST(RM)
   AC_SUBST(OSDIR)
  +AC_SUBST(DEFAULT_OSDIR)
   AC_SUBST(LIBPREFIX)
   AC_SUBST(EXEEXT)
  -AC_OUTPUT(Makefile lib/Makefile file_io/$OSDIR/Makefile 
  -          network_io/$OSDIR/Makefile threadproc/$OSDIR/Makefile 
  -          locks/$OSDIR/Makefile misc/$OSDIR/Makefile 
  -          time/$OSDIR/Makefile signal/$OSDIR/Makefile
  -          test/Makefile)
  +
  +MAKEFILE1="Makefile lib/Makefile "
  +SUBDIRS="lib "
  +for dir in $MODULES
  +do
  +    if test -d $dir/$OSDIR; then
  +        MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile "
  +        SUBDIRS="$SUBDIRS $dir/$OSDIR "
  +    else
  +        MAKEFILE2="$MAKEFILE2 $dir/$DEFAULT_OSDIR/Makefile "
  +        SUBDIRS="$SUBDIRS $dir/$DEFAULT_OSDIR "
  +    fi
  +done
  +MAKEFILE3="test/Makefile"
  +AC_SUBST(SUBDIRS)
  +AC_SUBST(MODULES)
  +AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3)