apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: apr/build apr_common.m4 apr_hints.m4 apr_network.m4 rules.mk.in
Date Tue, 03 Apr 2001 00:02:03 GMT
fielding    01/04/02 17:02:03

  Modified:    .        CHANGES configure.in
               build    apr_common.m4 apr_hints.m4 apr_network.m4
                        rules.mk.in
  Log:
  Define preprocessor options in CPPFLAGS instead of CFLAGS
  and avoid adding them over and over again.
  
  Revision  Changes    Path
  1.82      +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- CHANGES	2001/04/02 19:32:54	1.81
  +++ CHANGES	2001/04/03 00:02:01	1.82
  @@ -1,5 +1,8 @@
   Changes with APR b1  
   
  +  *) Define preprocessor flags in CPPFLAGS instead of CFLAGS and
  +     bring some sanity to the compiler command-lines. [Roy Fielding]
  +
     *) Use the dso/aix subdirectory for older versions of AIX and fix 
        a number of bugs in the dso code in that directory.
        [Victor Orlikowski]
  
  
  
  1.269     +6 -9      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.268
  retrieving revision 1.269
  diff -u -r1.268 -r1.269
  --- configure.in	2001/04/02 19:32:56	1.268
  +++ configure.in	2001/04/03 00:02:01	1.269
  @@ -98,10 +98,10 @@
   echo $ac_n "${nl}Check for compiler flags..."
   
   AC_ARG_ENABLE(debug,[  --enable-debug            Turn on debugging and compile time warnings],
  -        [if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else CFLAGS="$CFLAGS -g";
fi])
  +        [if test "$GCC" = "yes"; then OPTIM="$OPTIM -g -Wall"; else OPTIM="$OPTIM -g";
fi])
   
   AC_ARG_ENABLE(maintainer-mode,[  --enable-maintainer-mode  Turn on debugging and compile
time warnings],
  -        [if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall -Wmissing-prototypes -Wstrict-prototypes
-Wmissing-declarations"; else CFLAGS="$CFLAGS -g"; fi])
  +        [if test "$GCC" = "yes"; then OPTIM="$OPTIM -g -Wall -Wmissing-prototypes -Wstrict-prototypes
-Wmissing-declarations"; else OPTIM="$OPTIM -g"; fi])
   
   dnl # this is the place to put specific options for platform/compiler
   dnl # combinations
  @@ -127,7 +127,8 @@
          eolstr="\\n"
          ;;
      *-os2*)
  -       CFLAGS="$CFLAGS -DOS2 -Zmt"
  +       CPPFLAGS="$CPPFLAGS -DOS2"
  +       CFLAGS="$CFLAGS -Zmt"
          OSDIR="os2"
          enable_threads="system_threads"
          eolstr="\\r\\n"
  @@ -135,7 +136,7 @@
          ;;
      *beos*)
          OSDIR="beos"
  -       CFLAGS="$CFLAGS -DBEOS"
  +       CPPFLAGS="$CPPFLAGS -DBEOS"
          enable_threads="system_threads"
          config_subdirs="shmem/unix/mm"
          native_mmap_emul="1"
  @@ -333,7 +334,7 @@
   AC_SUBST(file_based)
   
   if test ".$SYS_SW" = ".AIX"; then
  -    CFLAGS="$CFLAGS -U__STR__"
  +    CPPFLAGS="$CPPFLAGS -U__STR__"
       case "$SYS_KV" in
           [12]*)
               AC_DEFINE(USEBCOPY)
  @@ -1032,10 +1033,6 @@
       MAKEFILE3="test/Makefile"
   fi
   AC_SUBST(SUBDIRS)
  -
  -if test -n "$CPPFLAGS"; then
  -  CFLAGS="$CFLAGS $CPPFLAGS"
  -fi
   
   dnl
   dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
  
  
  
  1.13      +1 -1      apr/build/apr_common.m4
  
  Index: apr_common.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_common.m4,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_common.m4	2001/03/21 15:01:53	1.12
  +++ apr_common.m4	2001/04/03 00:02:02	1.13
  @@ -62,7 +62,7 @@
   dnl  construct and save some lines of code.
   dnl
   AC_DEFUN(APR_DOEXTRA, [
  -  for i in CFLAGS LDFLAGS LIBS
  +  for i in CFLAGS CPPFLAGS LDFLAGS LIBS
     do
       eval APR_TMP=\$EXTRA_$i
       if test -n "$APR_TMP"; then
  
  
  
  1.4       +88 -82    apr/build/apr_hints.m4
  
  Index: apr_hints.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_hints.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_hints.m4	2001/03/09 15:24:28	1.3
  +++ apr_hints.m4	2001/04/03 00:02:02	1.4
  @@ -13,11 +13,11 @@
   dnl
   dnl APR_PRELOAD
   dnl
  -dnl  Preload various ENV/makefile paramsm such as CC, CFLAGS, etc
  +dnl  Preload various ENV/makefile params such as CC, CFLAGS, etc
   dnl  based on outside knowledge
   dnl
   dnl  Generally, we force the setting of CC, and add flags
  -dnl  to CFLAGS, LIBS and LDFLAGS. 
  +dnl  to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. 
   dnl
   AC_DEFUN(APR_PRELOAD, [
   if test "$DID_APR_PRELOAD" = "yes" ; then
  @@ -32,18 +32,18 @@
   
     case "$host" in
       *mint)
  -	APR_ADDTO(CFLAGS, [-DMINT])
  +	APR_ADDTO(CPPFLAGS, [-DMINT])
   	APR_ADDTO(LIBS, [-lportlib -lsocket])
   	;;
       *MPE/iX*)
  -	APR_ADDTO(CFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
  +	APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
   	APR_ADDTO(LIBS, [-lsocket -lsvipc -lcurses])
   	APR_ADDTO(LDFLAGS, [-Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\"])
   	APR_SETVAR(CAT, [/bin/cat])
   	;;
       *-apple-aux3*)
           APR_SETVAR(CC, [gcc])
  -	APR_ADDTO(CFLAGS, [-DAUX3 -D_POSIX_SOURCE])
  +	APR_ADDTO(CPPFLAGS, [-DAUX3 -D_POSIX_SOURCE])
   	APR_ADDTO(LIBS, [-lposix -lbsd])
   	APR_ADDTO(LDFLAGS, [-s])
   	APR_SETVAR(SHELL, [/bin/ksh])
  @@ -51,60 +51,59 @@
       *-ibm-aix*)
           case $host in
           i386-ibm-aix*)
  -	    APR_ADDTO(CFLAGS, [-U__STR__ -DUSEBCOPY])
  +	    APR_ADDTO(CPPFLAGS, [-U__STR__ -DUSEBCOPY])
   	    ;;
           *-ibm-aix[1-2].*)
  -	    APR_ADDTO(CFLAGS, [-DNEED_RLIM_T -U__STR__])
  +	    APR_ADDTO(CPPFLAGS, [-DNEED_RLIM_T -U__STR__])
   	    ;;
           *-ibm-aix3.*)
  -	    APR_ADDTO(CFLAGS, [-DNEED_RLIM_T -U__STR__])
  +	    APR_ADDTO(CPPFLAGS, [-DNEED_RLIM_T -U__STR__])
   	    ;;
           *-ibm-aix4.1)
  -	    APR_ADDTO(CFLAGS, [-DNEED_RLIM_T -U__STR__])
  +	    APR_ADDTO(CPPFLAGS, [-DNEED_RLIM_T -U__STR__])
   	    ;;
           *-ibm-aix4.1.*)
  -            APR_ADDTO(CFLAGS, [-DNEED_RLIM_T -U__STR__])
  +            APR_ADDTO(CPPFLAGS, [-DNEED_RLIM_T -U__STR__])
               ;;
           *-ibm-aix4.2)
  -	    APR_ADDTO(CFLAGS, [-U__STR__])
  +	    APR_ADDTO(CPPFLAGS, [-U__STR__])
   	    ;;
           *-ibm-aix4.2.*)
  -            APR_ADDTO(CFLAGS, [-U__STR__])
  +            APR_ADDTO(CPPFLAGS, [-U__STR__])
               ;;
           *-ibm-aix4.3)
  -	    APR_ADDTO(CFLAGS, [-D_USE_IRS -U__STR__])
  +	    APR_ADDTO(CPPFLAGS, [-D_USE_IRS -U__STR__])
   	    ;;
           *-ibm-aix4.3.*)
  -            APR_ADDTO(CFLAGS, [-D_USE_IRS -U__STR__])
  +            APR_ADDTO(CPPFLAGS, [-D_USE_IRS -U__STR__])
               ;;
           *-ibm-aix*)
  -	    APR_ADDTO(CFLAGS, [-U__STR__])
  +	    APR_ADDTO(CPPFLAGS, [-U__STR__])
   	    ;;
           esac
           dnl Must do a check for gcc or egcs here, to get the right options  
           dnl to the compiler.
   	AC_PROG_CC
           if test "$GCC" != "yes"; then
  -          APR_ADDTO(CFLAGS, [-qHALT=E])
  -          APR_ADDTO(CFLAGS, [-qLANGLVL=extended])
  +          APR_ADDTO(CFLAGS, [-qHALT=E -qLANGLVL=extended])
           fi
   	APR_SETIFNULL(apr_iconv_inbuf_const, [1])
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_THREAD_SAFE])
           ;;
       *-apollo-*)
  -	APR_ADDTO(CFLAGS, [-DAPOLLO])
  +	APR_ADDTO(CPPFLAGS, [-DAPOLLO])
   	;;
       *-dg-dgux*)
  -	APR_ADDTO(CFLAGS, [-DDGUX])
  +	APR_ADDTO(CPPFLAGS, [-DDGUX])
   	;;
       *os2_emx*)
   	APR_SETVAR(SHELL, [sh])
   	;;
       *-hi-hiux)
  -	APR_ADDTO(CFLAGS, [-DHIUX])
  +	APR_ADDTO(CPPFLAGS, [-DHIUX])
   	;;
       *-hp-hpux11.*)
  -	APR_ADDTO(CFLAGS, [-DHPUX11])
  +	APR_ADDTO(CPPFLAGS, [-DHPUX11])
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_REENTRANT])
   	;;
       *-hp-hpux10.*)
  @@ -112,22 +111,22 @@
    	  *-hp-hpux10.01)
   dnl	       # We know this is a problem in 10.01.
   dnl	       # Not a problem in 10.20.  Otherwise, who knows?
  -	       APR_ADDTO(CFLAGS, [-DSELECT_NEEDS_CAST])
  +	       APR_ADDTO(CPPFLAGS, [-DSELECT_NEEDS_CAST])
   	       ;;	     
    	esac
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_REENTRANT])
   	;;
       *-hp-hpux*)
  -	APR_ADDTO(CFLAGS, [-DHPUX])
  +	APR_ADDTO(CPPFLAGS, [-DHPUX])
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_REENTRANT])
   	;;
       *-linux-*)
           case `uname -r` in
  -	    2.2* ) APR_ADDTO(CFLAGS, [-DLINUX=2])
  +	    2.2* ) APR_ADDTO(CPPFLAGS, [-DLINUX=2])
   	           ;;
  -	    2.0* ) APR_ADDTO(CFLAGS, [-DLINUX=2])
  +	    2.0* ) APR_ADDTO(CPPFLAGS, [-DLINUX=2])
   	           ;;
  -	    1.* )  APR_ADDTO(CFLAGS, [-DLINUX=1])
  +	    1.* )  APR_ADDTO(CPPFLAGS, [-DLINUX=1])
   	           ;;
   	    * )
   	           ;;
  @@ -135,11 +134,11 @@
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_REENTRANT])
   	;;
       *-GNU*)
  -	APR_ADDTO(CFLAGS, [-DHURD])
  +	APR_ADDTO(CPPFLAGS, [-DHURD])
   	APR_ADDTO(LIBS, [-lcrypt])
   	;;
       *-lynx-lynxos)
  -	APR_ADDTO(CFLAGS, [-D__NO_INCLUDE_WARN__ -DLYNXOS])
  +	APR_ADDTO(CPPFLAGS, [-D__NO_INCLUDE_WARN__ -DLYNXOS])
   	APR_ADDTO(LIBS, [-lbsd -lcrypt])
   	;;
       *486-*-bsdi*)
  @@ -149,7 +148,7 @@
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_POSIX_THREADS])
   	;;
       *-netbsd*)
  -	APR_ADDTO(CFLAGS, [-DNETBSD])
  +	APR_ADDTO(CPPFLAGS, [-DNETBSD])
   	APR_ADDTO(LIBS, [-lcrypt])
   	;;
       *-freebsd*)
  @@ -164,139 +163,143 @@
   	;;
       *-next-nextstep*)
   	APR_SETIFNULL(OPTIM, [-O])
  -	APR_ADDTO(CFLAGS, [-DNEXT])
  +	APR_ADDTO(CPPFLAGS, [-DNEXT])
   	;;
       *-next-openstep*)
   	APR_SETVAR(CC, [cc])
   	APR_SETIFNULL(OPTIM, [-O])
  -	APR_ADDTO(CFLAGS, [-DNEXT])
  +	APR_ADDTO(CPPFLAGS, [-DNEXT])
   	;;
   dnl    *-apple-rhapsody*)
  -dnl	APR_ADDTO(CFLAGS, [-DDARWIN -DMAC_OS_X_SERVER])
  +dnl	APR_ADDTO(CPPFLAGS, [-DDARWIN -DMAC_OS_X_SERVER])
   dnl	;;
       *-apple-darwin*)
  -	APR_ADDTO(CFLAGS, [-DDARWIN])
  +	APR_ADDTO(CPPFLAGS, [-DDARWIN])
   	;;
       *-dec-osf*)
  -	APR_ADDTO(CFLAGS, [-DOSF1])
  +	APR_ADDTO(CPPFLAGS, [-DOSF1])
   	;;
       *-qnx)
  -	APR_ADDTO(CFLAGS, [-DQNX])
  +	APR_ADDTO(CPPFLAGS, [-DQNX])
   	APR_ADDTO(LIBS, [-N128k -lsocket -lunix])
   	;;
       *-qnx32)
           APR_SETVAR(CC, [cc -F])
  -	APR_ADDTO(CFLAGS, [-DQNX -mf -3])
  +	APR_ADDTO(CPPFLAGS, [-DQNX])
  +	APR_ADDTO(CFLAGS, [-mf -3])
   	APR_ADDTO(LIBS, [-N128k -lsocket -lunix])
   	;;
       *-isc4*)
   	APR_SETVAR(CC, [gcc])
  -	APR_ADDTO(CFLAGS, [-posix -DISC])
  +	APR_ADDTO(CPPFLAGS, [-posix -DISC])
   	APR_ADDTO(LDFLAGS, [-posix])
   	APR_ADDTO(LIBS, [-linet])
   	;;
       *-sco3*)
  -	APR_ADDTO(CFLAGS, [-DSCO -Oacgiltz])
  +	APR_ADDTO(CPPFLAGS, [-DSCO])
  +	APR_ADDTO(CFLAGS, [-Oacgiltz])
   	APR_ADDTO(LIBS, [-lPW -lsocket -lmalloc -lcrypt_i])
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_REENTRANT])
   	;;
       *-sco5*)
  -	APR_ADDTO(CFLAGS, [-DSCO5])
  +	APR_ADDTO(CPPFLAGS, [-DSCO5])
   	APR_ADDTO(LIBS, [-lsocket -lmalloc -lprot -ltinfo -lx])
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_REENTRANT])
   	;;
       *-sco_sv*|*-SCO_SV*)
  -	APR_ADDTO(CFLAGS, [-DSCO])
  +	APR_ADDTO(CPPFLAGS, [-DSCO])
   	APR_ADDTO(LIBS, [-lPW -lsocket -lmalloc -lcrypt_i])
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_REENTRANT])
   	;;
       *-solaris2*)
       	PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
  -	APR_ADDTO(CFLAGS, [-DSOLARIS2=$PLATOSVERS])
  +	APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS])
   	APR_ADDTO(LIBS, [-lsocket -lnsl])
   	APR_SETIFNULL(apr_iconv_inbuf_const, [1])
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT])
   	;;
       *-sunos4*)
  -	APR_ADDTO(CFLAGS, [-DSUNOS4 -DUSEBCOPY])
  +	APR_ADDTO(CPPFLAGS, [-DSUNOS4 -DUSEBCOPY])
   	;;
       *-unixware1)
  -	APR_ADDTO(CFLAGS, [-DUW=100])
  +	APR_ADDTO(CPPFLAGS, [-DUW=100])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt])
   	;;
       *-unixware2)
  -	APR_ADDTO(CFLAGS, [-DUW=200])
  +	APR_ADDTO(CPPFLAGS, [-DUW=200])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt -lgen])
   	;;
       *-unixware211)
  -	APR_ADDTO(CFLAGS, [-DUW=211])
  +	APR_ADDTO(CPPFLAGS, [-DUW=211])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt -lgen])
   	;;
       *-unixware212)
  -	APR_ADDTO(CFLAGS, [-DUW=212])
  +	APR_ADDTO(CPPFLAGS, [-DUW=212])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt -lgen])
   	;;
       *-unixware7)
  -	APR_ADDTO(CFLAGS, [-DUW=700])
  +	APR_ADDTO(CPPFLAGS, [-DUW=700])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt -lgen])
   	;;
       maxion-*-sysv4*)
  -	APR_ADDTO(CFLAGS, [-DSVR4])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc -lgen])
   	;;
       *-*-powermax*)
  -	APR_ADDTO(CFLAGS, [-DSVR4])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lgen])
   	;;
       TPF)
          APR_SETVAR(CC, [c89])
  -       APR_ADDTO(CFLAGS, [-DTPF -D_POSIX_SOURCE])
  +       APR_ADDTO(CPPFLAGS, [-DTPF -D_POSIX_SOURCE])
          ;;
       BS2000*-siemens-sysv4*)
   	APR_SETVAR(CC, [c89 -XLLML -XLLMK -XL -Kno_integer_overflow])
  -	APR_ADDTO(CFLAGS, [-DSVR4 -D_XPG_IV])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4 -D_XPG_IV])
   	;;
       *-siemens-sysv4*)
  -	APR_ADDTO(CFLAGS, [-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT
-DNEED_UNION_SEMUN])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT
-DNEED_UNION_SEMUN])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
   	;;
       pyramid-pyramid-svr4)
  -	APR_ADDTO(CFLAGS, [-DSVR4 -DNO_LONG_DOUBLE])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4 -DNO_LONG_DOUBLE])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
   	;;
       DS/90\ 7000-*-sysv4*)
  -	APR_ADDTO(CFLAGS, [-DUXPDS])
  +	APR_ADDTO(CPPFLAGS, [-DUXPDS])
   	APR_ADDTO(LIBS, [-lsocket -lnsl])
   	;;
       *-tandem-sysv4*)
  -	APR_ADDTO(CFLAGS, [-DSVR4])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4])
   	APR_ADDTO(LIBS, [-lsocket -lnsl])
   	;;
       *-ncr-sysv4)
  -	APR_ADDTO(CFLAGS, [-DSVR4 -DMPRAS])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4 -DMPRAS])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
   	;;
       *-sysv4*)
  -	APR_ADDTO(CFLAGS, [-DSVR4])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
   	;;
       88k-encore-sysv4)
  -	APR_ADDTO(CFLAGS, [-DSVR4 -DENCORE])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4 -DENCORE])
   	APR_ADDTO(LIBS, [-lPW])
   	;;
       *-uts*)
   	PLATOSVERS=`echo $host | sed 's/^.*,//'`
   	case $PLATOSVERS in
  -	    2*) APR_ADDTO(CFLAGS, [-Xa -eft -DUTS21 -DUSEBCOPY])
  +	    2*) APR_ADDTO(CPPFLAGS, [-DUTS21 -DUSEBCOPY])
  +	        APR_ADDTO(CFLAGS, [-Xa -eft])
   	        APR_ADDTO(LIBS, [-lsocket -lbsd -la])
   	        ;;
  -	    *)  APR_ADDTO(CFLAGS, [-Xa -DSVR4])
  +	    *)  APR_ADDTO(CPPFLAGS, [-DSVR4])
  +	        APR_ADDTO(CFLAGS, [-Xa])
   	        APR_ADDTO(LIBS, [-lsocket -lnsl])
   	        ;;
   	esac
   	;;
       *-ultrix)
  -	APR_ADDTO(CFLAGS, [-DULTRIX])
  +	APR_ADDTO(CPPFLAGS, [-DULTRIX])
   	APR_SETVAR(SHELL, [/bin/sh5])
   	;;
       *powerpc-tenon-machten*)
  @@ -306,42 +309,49 @@
   	APR_ADDTO(LDFLAGS, [-stack 0x14000])
   	;;
       *convex-v11*)
  -	APR_ADDTO(CFLAGS, [-ext -DCONVEXOS11])
  +	APR_ADDTO(CPPFLAGS, [-DCONVEXOS11])
  +	APR_ADDTO(CFLAGS, [-ext])
   	APR_SETIFNULL(OPTIM, [-O1])
   	APR_SETVAR(CC, [cc])
   	;;
       i860-intel-osf1)
  -	APR_ADDTO(CFLAGS, [-DPARAGON])
  +	APR_ADDTO(CPPFLAGS, [-DPARAGON])
   	;;
       *-sequent-ptx2.*.*)
  -	APR_ADDTO(CFLAGS, [-DSEQUENT=20 -Wc,-pw])
  +	APR_ADDTO(CPPFLAGS, [-DSEQUENT=20])
  +	APR_ADDTO(CFLAGS, [-Wc,-pw])
   	APR_ADDTO(LIBS, [-lsocket -linet -lnsl -lc -lseq])
   	;;
       *-sequent-ptx4.0.*)
  -	APR_ADDTO(CFLAGS, [-DSEQUENT=40 -Wc,-pw])
  +	APR_ADDTO(CPPFLAGS, [-DSEQUENT=40])
  +	APR_ADDTO(CFLAGS, [-Wc,-pw])
   	APR_ADDTO(LIBS, [-lsocket -linet -lnsl -lc])
   	;;
       *-sequent-ptx4.[123].*)
  -	APR_ADDTO(CFLAGS, [-DSEQUENT=41 -Wc,-pw])
  +	APR_ADDTO(CPPFLAGS, [-DSEQUENT=41])
  +	APR_ADDTO(CFLAGS, [-Wc,-pw])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
   	;;
       *-sequent-ptx4.4.*)
  -	APR_ADDTO(CFLAGS, [-DSEQUENT=44 -Wc,-pw])
  +	APR_ADDTO(CPPFLAGS, [-DSEQUENT=44])
  +	APR_ADDTO(CFLAGS, [-Wc,-pw])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
   	;;
       *-sequent-ptx4.5.*)
  -	APR_ADDTO(CFLAGS, [-DSEQUENT=45 -Wc,-pw])
  +	APR_ADDTO(CPPFLAGS, [-DSEQUENT=45])
  +	APR_ADDTO(CFLAGS, [-Wc,-pw])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
   	;;
       *-sequent-ptx5.0.*)
  -	APR_ADDTO(CFLAGS, [-DSEQUENT=50 -Wc,-pw])
  +	APR_ADDTO(CPPFLAGS, [-DSEQUENT=50])
  +	APR_ADDTO(CFLAGS, [-Wc,-pw])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
   	;;
       *NEWS-OS*)
  -	APR_ADDTO(CFLAGS, [-DNEWSOS])
  +	APR_ADDTO(CPPFLAGS, [-DNEWSOS])
   	;;
       *-riscix)
  -	APR_ADDTO(CFLAGS, [-DRISCIX])
  +	APR_ADDTO(CPPFLAGS, [-DRISCIX])
   	APR_SETIFNULL(OPTIM, [-O])
   	APR_SETIFNULL(MAKE, [make])
   	;;
  @@ -349,7 +359,7 @@
   	APR_ADDTO(THREAD_CPPFLAGS, [-D_POSIX_THREAD_SAFE_FUNCTIONS])
   	;;
       *beos*)
  -        APR_ADDTO(CFLAGS, [-DBEOS])
  +        APR_ADDTO(CPPFLAGS, [-DBEOS])
           PLATOSVERS=`uname -r`
           case $PLATOSVERS in
               5.1)
  @@ -360,31 +370,27 @@
   	esac
   	;;
       4850-*.*)
  -	APR_ADDTO(CFLAGS, [-DSVR4 -DMPRAS])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4 -DMPRAS])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
   	;;
       drs6000*)
  -	APR_ADDTO(CFLAGS, [-DSVR4])
  +	APR_ADDTO(CPPFLAGS, [-DSVR4])
   	APR_ADDTO(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
   	;;
       m88k-*-CX/SX|CYBER)
  -	APR_ADDTO(CFLAGS, [-D_CX_SX -Xa])
  +	APR_ADDTO(CPPFLAGS, [-D_CX_SX])
  +	APR_ADDTO(CFLAGS, [-Xa])
   	APR_SETVAR(CC, [cc])
   	;;
       *-tandem-oss)
  -	APR_ADDTO(CFLAGS, [-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1])
  +	APR_ADDTO(CPPFLAGS, [-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1])
   	APR_SETVAR(CC, [c89])
   	;;
       *-ibm-os390)
          APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
          APR_SETIFNULL(apr_process_lock_is_global, [yes])
          APR_SETIFNULL(CC, [cc])
  -       APR_ADDTO(CFLAGS, [-U_NO_PROTO])
  -       APR_ADDTO(CFLAGS, [-DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR])
  -       APR_ADDTO(CFLAGS, [-DPTHREAD_SETS_ERRNO])
  -       APR_ADDTO(CFLAGS, [-DPTHREAD_DETACH_ARG1_ADDR])
  -       APR_ADDTO(CFLAGS, [-DSIGPROCMASK_SETS_THREAD_MASK])
  -       APR_ADDTO(CFLAGS, [-DTCP_NODELAY=1])
  +       APR_ADDTO(CPPFLAGS, [-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO
-DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
          ;;
     esac
     APR_DOEXTRA
  
  
  
  1.3       +15 -15    apr/build/apr_network.m4
  
  Index: apr_network.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_network.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_network.m4	2001/02/20 01:53:47	1.2
  +++ apr_network.m4	2001/04/03 00:02:02	1.3
  @@ -267,7 +267,7 @@
   dnl
   AC_DEFUN(APR_H_ERRNO_COMPILE_CHECK,[
     if test x$1 != x; then
  -    CFLAGS="-D$1 $CFLAGS"
  +    CPPFLAGS="-D$1 $CPPFLAGS"
     fi
     AC_TRY_COMPILE([
   #ifdef HAVE_SYS_TYPES_H
  @@ -280,12 +280,12 @@
   int h_e = h_errno;
   ],[
     if test x$1 != x; then
  -    ac_cv_h_errno_cflags="$1"
  +    ac_cv_h_errno_cppflags="$1"
     else
  -    ac_cv_h_errno_cflags=yes
  +    ac_cv_h_errno_cppflags=yes
     fi
   ],[
  -  ac_cv_h_errno_cflags=no
  +  ac_cv_h_errno_cppflags=no
   ])])
   
   
  @@ -296,28 +296,28 @@
   dnl
   AC_DEFUN(APR_CHECK_H_ERRNO_FLAG,[
     AC_MSG_CHECKING([for h_errno in netdb.h])
  -  AC_CACHE_VAL(ac_cv_h_errno_cflags,[
  +  AC_CACHE_VAL(ac_cv_h_errno_cppflags,[
       APR_H_ERRNO_COMPILE_CHECK
  -    if test "$ac_cv_h_errno_cflags" = "no"; then
  -      ac_save="$CFLAGS"
  +    if test "$ac_cv_h_errno_cppflags" = "no"; then
  +      ac_save="$CPPFLAGS"
         for flag in _XOPEN_SOURCE_EXTENDED; do
           APR_H_ERRNO_COMPILE_CHECK($flag)
  -        if test "$ac_cv_h_errno_cflags" != "no"; then
  +        if test "$ac_cv_h_errno_cppflags" != "no"; then
             break
           fi
         done
  -      CFLAGS="$ac_save"
  +      CPPFLAGS="$ac_save"
       fi
     ])
  -  if test "$ac_cv_h_errno_cflags" != "no"; then
  -    if test "$ac_cv_h_errno_cflags" != "yes"; then
  -      CFLAGS="-D$ac_cv_h_errno_cflags $CFLAGS"
  -      AC_MSG_RESULT([yes, with -D$ac_cv_h_errno_cflags])
  +  if test "$ac_cv_h_errno_cppflags" != "no"; then
  +    if test "$ac_cv_h_errno_cppflags" != "yes"; then
  +      CPPFLAGS="-D$ac_cv_h_errno_cppflags $CPPFLAGS"
  +      AC_MSG_RESULT([yes, with -D$ac_cv_h_errno_cppflags])
       else
  -      AC_MSG_RESULT([$ac_cv_h_errno_cflags])
  +      AC_MSG_RESULT([$ac_cv_h_errno_cppflags])
       fi
     else
  -    AC_MSG_RESULT([$ac_cv_h_errno_cflags])
  +    AC_MSG_RESULT([$ac_cv_h_errno_cppflags])
     fi
   ])
   
  
  
  
  1.4       +4 -3      apr/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/build/rules.mk.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rules.mk.in	2001/03/07 22:09:16	1.3
  +++ rules.mk.in	2001/04/03 00:02:02	1.4
  @@ -68,8 +68,9 @@
   AWK=@AWK@
   LIBTOOL=@LIBTOOL@
   
  -CFLAGS=@CFLAGS@ @OPTIM@
  -CPPFLAGS=@CPPFLAGS@ $(INCLUDES)
  +CFLAGS=@CFLAGS@
  +OPTIM=@OPTIM@
  +CPPFLAGS=@CPPFLAGS@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@
   
  @@ -82,7 +83,7 @@
   #
   # Basic macro setup
   #
  -COMPILE      = $(CC) $(CPPFLAGS) $(CFLAGS)
  +COMPILE      = $(CC) $(CPPFLAGS) $(CFLAGS) $(OPTIM) $(INCLUDES)
   LT_COMPILE   = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< && touch
$@
   
   LINK         = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@
  
  
  

Mime
View raw message