striker 2003/08/18 03:43:19 Modified: . aprutil.dsp configure.in libaprutil.dsp dbm apr_dbm_berkeleydb.c include apu.h.in apu.hnw apu.hw Added: include apu_want.h.in apu_want.hnw apu_want.hw Log: * configure.in Add apu_want.h to the output list. * aprutil.dsp * libaprutil.dsp Add new sourcefiles: apu_want.h* * dbm/apr_dbm_berkeleydb.c Include the Berkeley DB header by using the new APU_WANT_DB. * include/apu.h.in * include/apu.hnw * include/apu.hw Remove the inclusion of db.h triggered by a private symbol. * include/apu_want.h.in * include/apu_want.hnw * include/apu_want.hw New files, introducing conditional action based on APU_WANT_xxx. Revision Changes Path 1.54 +35 -0 apr-util/aprutil.dsp Index: aprutil.dsp =================================================================== RCS file: /home/cvs/apr-util/aprutil.dsp,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- aprutil.dsp 28 Mar 2003 22:35:20 -0000 1.53 +++ aprutil.dsp 18 Aug 2003 10:43:19 -0000 1.54 @@ -372,6 +372,41 @@ # End Source File # Begin Source File +SOURCE=.\include\apu_want.h.in +# End Source File +# Begin Source File + +SOURCE=.\include\apu_want.hnw +# End Source File +# Begin Source File + +SOURCE=.\include\apu_want.hw + +!IF "$(CFG)" == "aprutil - Win32 Release" + +# Begin Custom Build - Creating apu_want.h from apu_want.hw +InputPath=.\include\apu_want.hw + +".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + type .\include\apu_want.hw > .\include\apu_want.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "aprutil - Win32 Debug" + +# Begin Custom Build - Creating apu_want.h from apu_want.hw +InputPath=.\include\apu_want.hw + +".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + type .\include\apu_want.hw > .\include\apu_want.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\include\private\apu_config.h.in # End Source File # Begin Source File 1.69 +1 -0 apr-util/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apr-util/configure.in,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- configure.in 12 Jun 2003 07:27:10 -0000 1.68 +++ configure.in 18 Aug 2003 10:43:19 -0000 1.69 @@ -197,6 +197,7 @@ include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h + include/apu_want.h $MAKEFILES ],[ chmod +x apu-config 1.53 +35 -0 apr-util/libaprutil.dsp Index: libaprutil.dsp =================================================================== RCS file: /home/cvs/apr-util/libaprutil.dsp,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- libaprutil.dsp 28 Mar 2003 22:35:20 -0000 1.52 +++ libaprutil.dsp 18 Aug 2003 10:43:19 -0000 1.53 @@ -378,6 +378,41 @@ # End Source File # Begin Source File +SOURCE=.\include\apu_want.h.in +# End Source File +# Begin Source File + +SOURCE=.\include\apu_want.hnw +# End Source File +# Begin Source File + +SOURCE=.\include\apu_want.hw + +!IF "$(CFG)" == "libaprutil - Win32 Release" + +# Begin Custom Build - Creating apu_want.h from apu_want.hw +InputPath=.\include\apu_want.hw + +".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + type .\include\apu_want.hw > .\include\apu_want.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug" + +# Begin Custom Build - Creating apu_want.h from apu_want.hw +InputPath=.\include\apu_want.hw + +".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + type .\include\apu_want.hw > .\include\apu_want.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\include\private\apu_config.h.in # End Source File # Begin Source File 1.23 +3 -1 apr-util/dbm/apr_dbm_berkeleydb.c Index: apr_dbm_berkeleydb.c =================================================================== RCS file: /home/cvs/apr-util/dbm/apr_dbm_berkeleydb.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- apr_dbm_berkeleydb.c 1 Jan 2003 00:02:19 -0000 1.22 +++ apr_dbm_berkeleydb.c 18 Aug 2003 10:43:19 -0000 1.23 @@ -55,7 +55,9 @@ #include "apr_strings.h" #define APR_WANT_MEMFUNC #include "apr_want.h" -#define APU_DBM_BERKELEYDB_PRIVATE 1 + +#define APU_WANT_DB +#include "apu_want.h" #if APR_HAVE_STDLIB_H #include /* for abort() */ 1.19 +0 -5 apr-util/include/apu.h.in Index: apu.h.in =================================================================== RCS file: /home/cvs/apr-util/include/apu.h.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apu.h.in 9 Jul 2003 18:47:52 -0000 1.18 +++ apu.h.in 18 Aug 2003 10:43:19 -0000 1.19 @@ -113,11 +113,6 @@ #define APU_HAVE_DB @apu_have_db@ #if APU_HAVE_DB -#ifdef APU_DBM_BERKELEYDB_PRIVATE -/* found version @apu_db_version@ */ -/* this is only required for compiling dbm/apr_dbm_berkeleydb */ -#include <@apu_db_header@> -#endif /* APU_DBM_BERKELEYDB_PRIVATE */ #define APU_HAVE_DB_VERSION @apu_db_version@ #endif /* APU_HAVE_DB */ 1.10 +0 -7 apr-util/include/apu.hnw Index: apu.hnw =================================================================== RCS file: /home/cvs/apr-util/include/apu.hnw,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apu.hnw 9 Jul 2003 19:31:07 -0000 1.9 +++ apu.hnw 18 Aug 2003 10:43:19 -0000 1.10 @@ -115,13 +115,6 @@ #define APU_HAVE_GDBM 0 #define APU_HAVE_DB 0 -#if APU_HAVE_DB -#ifdef APU_DBM_BERKELEYDB_PRIVATE -/* this is only required for compiling dbm/apr_dbm_berkeleydb */ -/* found version @db_version@ */ -#include -#endif -#endif #define HAVE_ICONV_H 1 #define APU_HAVE_APR_ICONV 0 1.14 +0 -7 apr-util/include/apu.hw Index: apu.hw =================================================================== RCS file: /home/cvs/apr-util/include/apu.hw,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- apu.hw 9 Jul 2003 19:31:08 -0000 1.13 +++ apu.hw 18 Aug 2003 10:43:19 -0000 1.14 @@ -146,13 +146,6 @@ #define APU_HAVE_GDBM 0 #define APU_HAVE_DB 0 -#if APU_HAVE_DB -#ifdef APU_DBM_BERKELEYDB_PRIVATE -/* this is only required for compiling dbm/apr_dbm_berkeleydb */ -/* win32 note.. you will need to change this for db1 */ -#include -#endif -#endif #define APU_HAVE_APR_ICONV 1 #define APU_HAVE_ICONV 0 1.1 apr-util/include/apu_want.h.in Index: apu_want.h.in =================================================================== /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ #include "apu.h" /* configuration data */ /** * @file apu_want.h * @brief APR Standard Headers Support * * 
   * Features:
   *
   *   APU_WANT_DB:       <@apu_db_header>
   *
   * Typical usage:
   *
   *   #define APU_WANT_DB
   *   #include "apu_want.h"
   *
   * The appropriate headers will be included.
   *
   * Note: it is safe to use this in a header (it won't interfere with other
   *       headers' or source files' use of apu_want.h)
   *
*/ /* --------------------------------------------------------------------- */ #ifdef APU_WANT_DB #if APU_HAVE_DB #include <@apu_db_header@> #endif #undef APU_WANT_DB #endif /* --------------------------------------------------------------------- */ 1.1 apr-util/include/apu_want.hnw Index: apu_want.hnw =================================================================== /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ #include "apu.h" /* configuration data */ /** * @file apu_want.h * @brief APR Standard Headers Support * * 
   * Features:
   *
   *   APU_WANT_DB:       <@apu_db_header>
   *
   * Typical usage:
   *
   *   #define APU_WANT_DB
   *   #include "apu_want.h"
   *
   * The appropriate headers will be included.
   *
   * Note: it is safe to use this in a header (it won't interfere with other
   *       headers' or source files' use of apu_want.h)
   *
*/ /* --------------------------------------------------------------------- */ #ifdef APU_WANT_DB #if APU_HAVE_DB /* win32 note.. you will need to change this for db1 */ #include #endif #undef APU_WANT_DB #endif /* --------------------------------------------------------------------- */ 1.1 apr-util/include/apu_want.hw Index: apu_want.hw =================================================================== /* ==================================================================== * The Apache Software License, Version 1.1 * * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ #include "apu.h" /* configuration data */ /** * @file apu_want.h * @brief APR Standard Headers Support * * 
   * Features:
   *
   *   APU_WANT_DB:       <@apu_db_header>
   *
   * Typical usage:
   *
   *   #define APU_WANT_DB
   *   #include "apu_want.h"
   *
   * The appropriate headers will be included.
   *
   * Note: it is safe to use this in a header (it won't interfere with other
   *       headers' or source files' use of apu_want.h)
   *
*/ /* --------------------------------------------------------------------- */ #ifdef APU_WANT_DB #if APU_HAVE_DB /* win32 note.. you will need to change this for db1 */ #include #endif #undef APU_WANT_DB #endif /* --------------------------------------------------------------------- */