httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <trawi...@bellsouth.net>
Subject Re: architecture-specific directories
Date Mon, 13 Nov 2000 20:32:45 GMT
rbb@covalent.net writes:

> There are a couple of ways to fix this.  It all depends on how we want to
> do it.  Will Rowe is thinking of always doing a directory walk, so that if
> we don't find the included file, we just look in Unix.  The other option
> is to do the directory walk only if we need to.  Here are two general
> ideas for how to fix it.  Choose the one that makes the most sense to
> you.  :-)
> 
> In misc/unix/Makefile.in
> 
> Change:
> 
> INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@
> 
> to:
> 
> INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@ -I $(INCDIR)/arch/unix
> 
> 
> OR
> 
> In misc/unix/Makefile.in
> 
> Change:
> 
> INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@
> 
> to:
> 
> INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@ -I $(INCDIR)/arch
> 
> and in misc/unix/start.c change
> 
> #include "misc.h"
> #include "locks.h"
> 
> to
> 
> #include "unix/misc.h"
> #include "unix/locks.h"
> 
> Either should work, but neither has been tested.
> 
> Ryan

This patch fairly closely implements the first possibility you listed,
but it allows customizing the include order based on the platform.

Index: lib/apr/configure.in
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.172
diff -u -r1.172 configure.in
--- configure.in        2000/11/13 03:18:18     1.172
+++ configure.in        2000/11/13 19:38:40
@@ -91,12 +91,14 @@
    *-os2*)
        CFLAGS="$CFLAGS -DOS2 -Zmt"
        OSDIR="os2"
+       INCLUDEOSDIR="-I\$(INCDIR)/arch/os2"
        LIBPREFIX=""
        enable_threads="system_threads"
        eolstr="\\r\\n"
        ;;
    *beos*)
        OSDIR="beos"
+       INCLUDEOSDIR="-I\$(INCDIR)/arch/beos"
        CFLAGS="$CFLAGS -DBEOS"
        enable_threads="system_threads"
        config_subdirs="shmem/unix/mm"
@@ -107,12 +109,14 @@
        ;;
    *os390)
        OSDIR="os390"
+       INCLUDEOSDIR="-I\$(INCDIR)/arch/os390 -I\$(INCDIR)/arch/unix"
        config_subdirs="shmem/unix/mm"
        USE_MM=yes
        eolstr="\\n"
        ;;
    *)
        OSDIR="unix"
+       INCLUDEOSDIR="-I\$(INCDIR)/arch/unix"
        config_subdirs="shmem/unix/mm"
        USE_MM=yes
        eolstr="\\n"
@@ -731,6 +735,7 @@
 AC_SUBST(AR)
 AC_SUBST(RM)
 AC_SUBST(OSDIR)
+AC_SUBST(INCLUDEOSDIR)
 AC_SUBST(DEFAULT_OSDIR)
 AC_SUBST(LIBPREFIX)
 AC_SUBST(EXEEXT)

Index: lib/apr/lib/Makefile.in
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/lib/Makefile.in,v
retrieving revision 1.32
diff -u -r1.32 Makefile.in
--- Makefile.in 2000/11/09 14:59:20     1.32
+++ Makefile.in 2000/11/13 19:38:49
@@ -11,7 +11,7 @@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
 INCDIR=../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@
+INCLUDES=-I$(INCDIR) @INCLUDEOSDIR@

 #LIB=@LIBPREFIX@apr.a

Index: lib/apr/misc/unix/Makefile.in
===================================================================
RCS file: /cvs/apache/apache-2.0/src/lib/apr/misc/unix/Makefile.in,v
retrieving revision 1.24
diff -u -r1.24 Makefile.in
--- Makefile.in 2000/11/09 06:30:11     1.24
+++ Makefile.in 2000/11/13 19:38:50
@@ -10,7 +10,7 @@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
 INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@
+INCLUDES=-I$(INCDIR) @INCLUDEOSDIR@

 #LIB=libmisc.a
                
-- 
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
     http://www.geocities.com/SiliconValley/Park/9289/
          Born in Roswell... married an alien...

Mime
View raw message