jim 01/01/11 05:49:01
Modified: . hints.m4
Log:
Clean up of how hints.m4 adds hints to various
compilation flags
Revision Changes Path
1.34 +143 -138 apr/hints.m4
Index: hints.m4
===================================================================
RCS file: /home/cvs/apr/hints.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- hints.m4 2001/01/05 19:57:46 1.33
+++ hints.m4 2001/01/11 13:49:00 1.34
@@ -4,61 +4,66 @@
dnl Preload various ENV/makefile paramsm 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
AC_DEFUN(APR_PRELOAD, [
echo "Applying hints file rules for $host"
case "$host" in
*mint)
- APR_SETIFNULL(CFLAGS, [-DMINT])
- APR_SETIFNULL(LIBS, [-lportlib -lsocket])
+ APR_ADDTO(CFLAGS, [-DMINT])
+ APR_ADDTO(LIBS, [-lportlib -lsocket])
;;
*MPE/iX*)
- APR_SETIFNULL(CFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
- APR_SETIFNULL(LIBS, [-lsocket -lsvipc -lcurses])
- APR_SETIFNULL(LDFLAGS, [-Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\"])
- APR_SETIFNULL(CAT, [/bin/cat])
+ APR_ADDTO(CFLAGS, [-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_SETIFNULL(CFLAGS, [-DAUX3 -D_POSIX_SOURCE])
- APR_SETIFNULL(LIBS, [-lposix -lbsd])
- APR_SETIFNULL(LDFLAGS, [-s])
+ APR_SETVAR(CC, [gcc])
+ APR_ADDTO(CFLAGS, [-DAUX3 -D_POSIX_SOURCE])
+ APR_ADDTO(LIBS, [-lposix -lbsd])
+ APR_ADDTO(LDFLAGS, [-s])
+ APR_SETVAR(SHELL, [/bin/ksh])
;;
*-ibm-aix*)
case $host in
i386-ibm-aix*)
- APR_SETIFNULL(CFLAGS, [-U__STR__ -DUSEBCOPY])
+ APR_ADDTO(CFLAGS, [-U__STR__ -DUSEBCOPY])
;;
*-ibm-aix[1-2].*)
- APR_SETIFNULL(CFLAGS, [-DNEED_RLIM_T -U__STR__])
+ APR_ADDTO(CFLAGS, [-DNEED_RLIM_T -U__STR__])
;;
*-ibm-aix3.*)
- APR_SETIFNULL(CFLAGS, [-DNEED_RLIM_T -U__STR__])
+ APR_ADDTO(CFLAGS, [-DNEED_RLIM_T -U__STR__])
;;
*-ibm-aix4.1)
- APR_SETIFNULL(CFLAGS, [-DNEED_RLIM_T -U__STR__])
+ APR_ADDTO(CFLAGS, [-DNEED_RLIM_T -U__STR__])
;;
*-ibm-aix4.1.*)
- APR_SETIFNULL(CFLAGS, [-DNEED_RLIM_T -U__STR__])
+ APR_ADDTO(CFLAGS, [-DNEED_RLIM_T -U__STR__])
;;
*-ibm-aix4.2)
- APR_SETIFNULL(CFLAGS, [-U__STR__])
- APR_SETIFNULL(LDFLAGS, [-lm])
+ APR_ADDTO(CFLAGS, [-U__STR__])
+ APR_ADDTO(LDFLAGS, [-lm])
;;
*-ibm-aix4.2.*)
- APR_SETIFNULL(CFLAGS, [-U__STR__])
- APR_SETIFNULL(LDFLAGS, [-lm])
+ APR_ADDTO(CFLAGS, [-U__STR__])
+ APR_ADDTO(LDFLAGS, [-lm])
;;
*-ibm-aix4.3)
- APR_SETIFNULL(CFLAGS, [-D_USE_IRS -U__STR__])
- APR_SETIFNULL(LDFLAGS, [-lm])
+ APR_ADDTO(CFLAGS, [-D_USE_IRS -U__STR__])
+ APR_ADDTO(LDFLAGS, [-lm])
;;
*-ibm-aix4.3.*)
- APR_SETIFNULL(CFLAGS, [-D_USE_IRS -U__STR__])
- APR_SETIFNULL(LDFLAGS, [-lm])
+ APR_ADDTO(CFLAGS, [-D_USE_IRS -U__STR__])
+ APR_ADDTO(LDFLAGS, [-lm])
;;
*-ibm-aix*)
- APR_SETIFNULL(CFLAGS, [-U__STR__])
- APR_SETIFNULL(LDFLAGS, [-lm])
+ APR_ADDTO(CFLAGS, [-U__STR__])
+ APR_ADDTO(LDFLAGS, [-lm])
;;
esac
dnl Must do a check for gcc or egcs here, to get the right options
@@ -70,21 +75,21 @@
fi
;;
*-apollo-*)
- APR_SETIFNULL(CFLAGS, [-DAPOLLO])
+ APR_ADDTO(CFLAGS, [-DAPOLLO])
;;
*-dg-dgux*)
- APR_SETIFNULL(CFLAGS, [-DDGUX])
+ APR_ADDTO(CFLAGS, [-DDGUX])
;;
*os2_emx*)
- APR_SETIFNULL(SHELL, [sh])
+ APR_SETVAR(SHELL, [sh])
APR_SETIFNULL(file_as_socket, [0])
;;
*-hi-hiux)
- APR_SETIFNULL(CFLAGS, [-DHIUX])
+ APR_ADDTO(CFLAGS, [-DHIUX])
;;
*-hp-hpux11.*)
- APR_SETIFNULL(CFLAGS, [-DHPUX11])
- APR_SETIFNULL(LIBS, [-lm -lpthread])
+ APR_ADDTO(CFLAGS, [-DHPUX11])
+ APR_ADDTO(LIBS, [-lm -lpthread])
;;
*-hp-hpux10.*)
case $host in
@@ -96,233 +101,233 @@
esac
;;
*-hp-hpux*)
- APR_SETIFNULL(CFLAGS, [-DHPUX])
- APR_SETIFNULL(LIBS, [-lm])
+ APR_ADDTO(CFLAGS, [-DHPUX])
+ APR_ADDTO(LIBS, [-lm])
;;
*-linux-*)
case `uname -r` in
- 2.2* ) APR_SETIFNULL(CFLAGS, [-DLINUX=2])
- APR_SETIFNULL(LIBS, [-lm])
+ 2.2* ) APR_ADDTO(CFLAGS, [-DLINUX=2])
+ APR_ADDTO(LIBS, [-lm])
;;
- 2.0* ) APR_SETIFNULL(CFLAGS, [-DLINUX=2])
- APR_SETIFNULL(LIBS, [-lm])
+ 2.0* ) APR_ADDTO(CFLAGS, [-DLINUX=2])
+ APR_ADDTO(LIBS, [-lm])
;;
- 1.* ) APR_SETIFNULL(CFLAGS, [-DLINUX=1])
+ 1.* ) APR_ADDTO(CFLAGS, [-DLINUX=1])
;;
* )
;;
esac
;;
*-GNU*)
- APR_SETIFNULL(CFLAGS, [-DHURD])
- APR_SETIFNULL(LIBS, [-lm -lcrypt])
+ APR_ADDTO(CFLAGS, [-DHURD])
+ APR_ADDTO(LIBS, [-lm -lcrypt])
;;
*-lynx-lynxos)
- APR_SETIFNULL(CFLAGS, [-D__NO_INCLUDE_WARN__ -DLYNXOS])
- APR_SETIFNULL(LIBS, [-lbsd -lcrypt])
+ APR_ADDTO(CFLAGS, [-D__NO_INCLUDE_WARN__ -DLYNXOS])
+ APR_ADDTO(LIBS, [-lbsd -lcrypt])
;;
*486-*-bsdi*)
- APR_SETIFNULL(CFLAGS, [-m486])
+ APR_ADDTO(CFLAGS, [-m486])
;;
*-netbsd*)
- APR_SETIFNULL(CFLAGS, [-DNETBSD])
- APR_SETIFNULL(LIBS, [-lcrypt])
+ APR_ADDTO(CFLAGS, [-DNETBSD])
+ APR_ADDTO(LIBS, [-lcrypt])
;;
*-freebsd*)
case $host in
*freebsd[2345]*)
- APR_SETIFNULL(CFLAGS, [-funsigned-char])
+ APR_ADDTO(CFLAGS, [-funsigned-char])
;;
esac
- APR_SETIFNULL(LIBS, [-lcrypt])
+ APR_ADDTO(LIBS, [-lcrypt])
;;
*-next-nextstep*)
APR_SETIFNULL(OPTIM, [-O])
- APR_SETIFNULL(CFLAGS, [-DNEXT])
+ APR_ADDTO(CFLAGS, [-DNEXT])
;;
*-next-openstep*)
- APR_SETIFNULL(CC, [cc])
+ APR_SETVAR(CC, [cc])
APR_SETIFNULL(OPTIM, [-O])
- APR_SETIFNULL(CFLAGS, [-DNEXT])
+ APR_ADDTO(CFLAGS, [-DNEXT])
;;
dnl *-apple-rhapsody*)
-dnl APR_SETIFNULL(CFLAGS, [-DDARWIN -DMAC_OS_X_SERVER])
+dnl APR_ADDTO(CFLAGS, [-DDARWIN -DMAC_OS_X_SERVER])
dnl ;;
*-apple-darwin*)
- APR_SETIFNULL(CFLAGS, [-DDARWIN])
+ APR_ADDTO(CFLAGS, [-DDARWIN])
;;
*-dec-osf*)
- APR_SETIFNULL(CFLAGS, [-DOSF1])
- APR_SETIFNULL(LIBS, [-lm])
+ APR_ADDTO(CFLAGS, [-DOSF1])
+ APR_ADDTO(LIBS, [-lm])
;;
*-qnx)
- APR_SETIFNULL(CFLAGS, [-DQNX])
- APR_SETIFNULL(LIBS, [-N128k -lsocket -lunix])
+ APR_ADDTO(CFLAGS, [-DQNX])
+ APR_ADDTO(LIBS, [-N128k -lsocket -lunix])
;;
*-qnx32)
- APR_SETIFNULL(CC, [cc -F])
- APR_SETIFNULL(CFLAGS, [-DQNX -mf -3])
- APR_SETIFNULL(LIBS, [-N128k -lsocket -lunix])
+ APR_SETVAR(CC, [cc -F])
+ APR_ADDTO(CFLAGS, [-DQNX -mf -3])
+ APR_ADDTO(LIBS, [-N128k -lsocket -lunix])
;;
*-isc4*)
- APR_SETIFNULL(CC, [gcc])
- APR_SETIFNULL(CFLAGS, [-posix -DISC])
- APR_SETIFNULL(LDFLAGS, [-posix])
- APR_SETIFNULL(LIBS, [-linet])
+ APR_SETVAR(CC, [gcc])
+ APR_ADDTO(CFLAGS, [-posix -DISC])
+ APR_ADDTO(LDFLAGS, [-posix])
+ APR_ADDTO(LIBS, [-linet])
;;
*-sco3*)
- APR_SETIFNULL(CFLAGS, [-DSCO -Oacgiltz])
- APR_SETIFNULL(LIBS, [-lPW -lsocket -lmalloc -lcrypt_i])
+ APR_ADDTO(CFLAGS, [-DSCO -Oacgiltz])
+ APR_ADDTO(LIBS, [-lPW -lsocket -lmalloc -lcrypt_i])
;;
*-sco5*)
- APR_SETIFNULL(CFLAGS, [-DSCO5])
- APR_SETIFNULL(LIBS, [-lsocket -lmalloc -lprot -ltinfo -lx -lm])
+ APR_ADDTO(CFLAGS, [-DSCO5])
+ APR_ADDTO(LIBS, [-lsocket -lmalloc -lprot -ltinfo -lx -lm])
;;
*-sco_sv*|*-SCO_SV*)
- APR_SETIFNULL(CFLAGS, [-DSCO])
- APR_SETIFNULL(LIBS, [-lPW -lsocket -lmalloc -lcrypt_i])
+ APR_ADDTO(CFLAGS, [-DSCO])
+ APR_ADDTO(LIBS, [-lPW -lsocket -lmalloc -lcrypt_i])
;;
*-solaris2*)
PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
- APR_SETIFNULL(CFLAGS, [-DSOLARIS2=$PLATOSVERS])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl])
+ APR_ADDTO(CFLAGS, [-DSOLARIS2=$PLATOSVERS])
+ APR_ADDTO(LIBS, [-lsocket -lnsl])
;;
*-sunos4*)
- APR_SETIFNULL(CFLAGS, [-DSUNOS4 -DUSEBCOPY])
+ APR_ADDTO(CFLAGS, [-DSUNOS4 -DUSEBCOPY])
;;
*-unixware1)
- APR_SETIFNULL(CFLAGS, [-DUW=100])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lcrypt])
+ APR_ADDTO(CFLAGS, [-DUW=100])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt])
;;
*-unixware2)
- APR_SETIFNULL(CFLAGS, [-DUW=200])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lcrypt -lgen])
+ APR_ADDTO(CFLAGS, [-DUW=200])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt -lgen])
;;
*-unixware211)
- APR_SETIFNULL(CFLAGS, [-DUW=211])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lcrypt -lgen])
+ APR_ADDTO(CFLAGS, [-DUW=211])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt -lgen])
;;
*-unixware212)
- APR_SETIFNULL(CFLAGS, [-DUW=212])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lcrypt -lgen])
+ APR_ADDTO(CFLAGS, [-DUW=212])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt -lgen])
;;
*-unixware7)
- APR_SETIFNULL(CFLAGS, [-DUW=700])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lcrypt -lgen])
+ APR_ADDTO(CFLAGS, [-DUW=700])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lcrypt -lgen])
;;
maxion-*-sysv4*)
- APR_SETIFNULL(CFLAGS, [-DSVR4])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc -lgen])
+ APR_ADDTO(CFLAGS, [-DSVR4])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc -lgen])
;;
*-*-powermax*)
- APR_SETIFNULL(CFLAGS, [-DSVR4])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lgen])
+ APR_ADDTO(CFLAGS, [-DSVR4])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lgen])
;;
TPF)
- APR_SETIFNULL(CC, [c89])
- APR_SETIFNULL(CFLAGS, [-DTPF -D_POSIX_SOURCE])
+ APR_SETVAR(CC, [c89])
+ APR_ADDTO(CFLAGS, [-DTPF -D_POSIX_SOURCE])
;;
BS2000*-siemens-sysv4*)
- APR_SETIFNULL(CC, [c89 -XLLML -XLLMK -XL -Kno_integer_overflow])
- APR_SETIFNULL(CFLAGS, [-DSVR4 -D_XPG_IV])
+ APR_SETVAR(CC, [c89 -XLLML -XLLMK -XL -Kno_integer_overflow])
+ APR_ADDTO(CFLAGS, [-DSVR4 -D_XPG_IV])
;;
*-siemens-sysv4*)
- APR_SETIFNULL(CFLAGS, [-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES
-DUSE_SYSVSEM_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc])
+ APR_ADDTO(CFLAGS, [-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_SETIFNULL(CFLAGS, [-DSVR4 -DNO_LONG_DOUBLE])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc])
+ APR_ADDTO(CFLAGS, [-DSVR4 -DNO_LONG_DOUBLE])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
;;
DS/90\ 7000-*-sysv4*)
- APR_SETIFNULL(CFLAGS, [-DUXPDS])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl])
+ APR_ADDTO(CFLAGS, [-DUXPDS])
+ APR_ADDTO(LIBS, [-lsocket -lnsl])
;;
*-tandem-sysv4*)
- APR_SETIFNULL(CFLAGS, [-DSVR4])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl])
+ APR_ADDTO(CFLAGS, [-DSVR4])
+ APR_ADDTO(LIBS, [-lsocket -lnsl])
;;
*-ncr-sysv4)
- APR_SETIFNULL(CFLAGS, [-DSVR4 -DMPRAS])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
+ APR_ADDTO(CFLAGS, [-DSVR4 -DMPRAS])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
;;
*-sysv4*)
- APR_SETIFNULL(CFLAGS, [-DSVR4])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc])
+ APR_ADDTO(CFLAGS, [-DSVR4])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
;;
88k-encore-sysv4)
- APR_SETIFNULL(CFLAGS, [-DSVR4 -DENCORE])
- APR_SETIFNULL(LIBS, [-lPW])
+ APR_ADDTO(CFLAGS, [-DSVR4 -DENCORE])
+ APR_ADDTO(LIBS, [-lPW])
;;
*-uts*)
PLATOSVERS=`echo $host | sed 's/^.*,//'`
case $PLATOSVERS in
- 2*) APR_SETIFNULL(CFLAGS, [-Xa -eft -DUTS21 -DUSEBCOPY])
- APR_SETIFNULL(LIBS, [-lsocket -lbsd -la])
+ 2*) APR_ADDTO(CFLAGS, [-Xa -eft -DUTS21 -DUSEBCOPY])
+ APR_ADDTO(LIBS, [-lsocket -lbsd -la])
;;
- *) APR_SETIFNULL(CFLAGS, [-Xa -DSVR4])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl])
+ *) APR_ADDTO(CFLAGS, [-Xa -DSVR4])
+ APR_ADDTO(LIBS, [-lsocket -lnsl])
;;
esac
;;
*-ultrix)
- APR_SETIFNULL(CFLAGS, [-DULTRIX])
- APR_SETIFNULL(SHELL, [/bin/sh5])
+ APR_ADDTO(CFLAGS, [-DULTRIX])
+ APR_SETVAR(SHELL, [/bin/sh5])
;;
*powerpc-tenon-machten*)
- APR_SETIFNULL(LDFLAGS, [-Xlstack=0x14000 -Xldelcsect])
+ APR_ADDTO(LDFLAGS, [-Xlstack=0x14000 -Xldelcsect])
;;
*-machten*)
- APR_SETIFNULL(LDFLAGS, [-stack 0x14000])
+ APR_ADDTO(LDFLAGS, [-stack 0x14000])
;;
*convex-v11*)
- APR_SETIFNULL(CFLAGS, [-ext -DCONVEXOS11])
+ APR_ADDTO(CFLAGS, [-ext -DCONVEXOS11])
APR_SETIFNULL(OPTIM, [-O1])
- APR_SETIFNULL(CC, [cc])
+ APR_SETVAR(CC, [cc])
;;
i860-intel-osf1)
- APR_SETIFNULL(CFLAGS, [-DPARAGON])
+ APR_ADDTO(CFLAGS, [-DPARAGON])
;;
*-sequent-ptx2.*.*)
- APR_SETIFNULL(CFLAGS, [-DSEQUENT=20 -Wc,-pw])
- APR_SETIFNULL(LIBS, [-lsocket -linet -lnsl -lc -lseq])
+ APR_ADDTO(CFLAGS, [-DSEQUENT=20 -Wc,-pw])
+ APR_ADDTO(LIBS, [-lsocket -linet -lnsl -lc -lseq])
;;
*-sequent-ptx4.0.*)
- APR_SETIFNULL(CFLAGS, [-DSEQUENT=40 -Wc,-pw])
- APR_SETIFNULL(LIBS, [-lsocket -linet -lnsl -lc])
+ APR_ADDTO(CFLAGS, [-DSEQUENT=40 -Wc,-pw])
+ APR_ADDTO(LIBS, [-lsocket -linet -lnsl -lc])
;;
*-sequent-ptx4.[123].*)
- APR_SETIFNULL(CFLAGS, [-DSEQUENT=41 -Wc,-pw])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc])
+ APR_ADDTO(CFLAGS, [-DSEQUENT=41 -Wc,-pw])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
;;
*-sequent-ptx4.4.*)
- APR_SETIFNULL(CFLAGS, [-DSEQUENT=44 -Wc,-pw])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc])
+ APR_ADDTO(CFLAGS, [-DSEQUENT=44 -Wc,-pw])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
;;
*-sequent-ptx4.5.*)
- APR_SETIFNULL(CFLAGS, [-DSEQUENT=45 -Wc,-pw])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc])
+ APR_ADDTO(CFLAGS, [-DSEQUENT=45 -Wc,-pw])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
;;
*-sequent-ptx5.0.*)
- APR_SETIFNULL(CFLAGS, [-DSEQUENT=50 -Wc,-pw])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc])
+ APR_ADDTO(CFLAGS, [-DSEQUENT=50 -Wc,-pw])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc])
;;
*NEWS-OS*)
- APR_SETIFNULL(CFLAGS, [-DNEWSOS])
+ APR_ADDTO(CFLAGS, [-DNEWSOS])
;;
*-riscix)
- APR_SETIFNULL(CFLAGS, [-DRISCIX])
+ APR_ADDTO(CFLAGS, [-DRISCIX])
APR_SETIFNULL(OPTIM, [-O])
APR_SETIFNULL(MAKE, [make])
;;
*beos*)
- APR_SETIFNULL(CFLAGS, [-DBEOS])
+ APR_ADDTO(CFLAGS, [-DBEOS])
PLATOSVERS=`uname -r`
case $PLATOSVERS in
5.1)
APR_ADDTO(CPPFLAGS, [-I/boot/develop/headers/bone])
APR_ADDTO(LDFLAGS, [-nodefaultlibs -L/boot/develop/lib/x86
-L/boot/beos/system/lib])
- APR_SETIFNULL(EXTRA_LIBS, [-lbind -lsocket -lbe -lroot])
+ APR_ADDTO(EXTRA_LIBS, [-lbind -lsocket -lbe -lroot])
APR_SETIFNULL(file_as_socket, [0])
;;
default)
@@ -331,20 +336,20 @@
esac
;;
4850-*.*)
- APR_SETIFNULL(CFLAGS, [-DSVR4 -DMPRAS])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
+ APR_ADDTO(CFLAGS, [-DSVR4 -DMPRAS])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
;;
drs6000*)
- APR_SETIFNULL(CFLAGS, [-DSVR4])
- APR_SETIFNULL(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
+ APR_ADDTO(CFLAGS, [-DSVR4])
+ APR_ADDTO(LIBS, [-lsocket -lnsl -lc -L/usr/ucblib -lucb])
;;
m88k-*-CX/SX|CYBER)
- APR_SETIFNULL(CFLAGS, [-D_CX_SX -Xa])
- APR_SETIFNULL(CC, [cc])
+ APR_ADDTO(CFLAGS, [-D_CX_SX -Xa])
+ APR_SETVAR(CC, [cc])
;;
*-tandem-oss)
- APR_SETIFNULL(CFLAGS, [-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1])
- APR_SETIFNULL(CC, [c89])
+ APR_ADDTO(CFLAGS, [-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1])
+ APR_SETVAR(CC, [c89])
;;
*-ibm-os390)
APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
