DEVEL15-cpp-autoconf-located-20071019

let autoconf find cpp

(cherry picked from commit 6122c757e1902baabc35d0ce0f6de336c2576b22)

diff --git a/configure.in b/configure.in
index 41e84230b393712660026e56fe81c9a7f45934f1..4f2a22f41ead619de3b20d0a877b85ea5a8d6312 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,6 +6,7 @@ MACOS_VERSION=1.5.25
 AC_SUBST(MACOS_VERSION)
 
 AC_PROG_CC
+AC_PROG_CPP
 OPENAFS_CONFIGURE_COMMON
 
 if test -d 'doc/man-pages' ; then

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index f51e1eb9d10a82cf1d71e348f04d1eb15e732a46..a6bc889b7ed134b16f2b21870efa529a7f489b59 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -32,6 +32,7 @@ AS = @AS@
 AFSD_LIBS = @AFSD_LIBS@
 AFSD_LDFLAGS = @AFSD_LDFLAGS@
 CC = @CC@
+CPP = @CPP@
 CCOBJ = @CCOBJ@
 CCXPG2 = @CCXPG2@
 CFLAGS = @CFLAGS@

diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in
index e71ed07b6bf8e326424362db0feb8ce08028b0ba..ef38c3c55b1f0d419cb646be391014475ec160b5 100644 (file)
--- a/src/libafsrpc/Makefile.in
+++ b/src/libafsrpc/Makefile.in
@@ -354,7 +354,7 @@ fasttime.o: ${LWP}/fasttime.c
 syscall.o: ${SYS}/syscall.s
        case "$(SYS_NAME)" in \
             sun4x_5* | sunx86_5*) \
-               /usr/ccs/lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* | *_darwin_* ) \
@@ -366,7 +366,7 @@ syscall.o: ${SYS}/syscall.s
         *bsd* ) \
                touch syscall.o ;; \
         *) \
-               /lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index b70a67823488537c135a5badd2bd7790f4f406a8..d7306b284068def0a81f4f4b9856969d8088ca2d 100644 (file)
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -37,7 +37,7 @@ process.o     : process.s process.i386.s process.c
        pmax_he1) \
                $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} process.s;; \
        sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5* ) \
-               /usr/ccs/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
+               $(CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
                ${AS} process.ss -o process.o; \
                        $(RM) process.ss ;; \
        sgi_5* ) \
@@ -45,11 +45,11 @@ process.o   : process.s process.i386.s process.c
        sgi_61 | sgi_62 | sgi_63 ) \
                $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} ${ARCHFLAGS} -I${TOP_INCDIR} -KPIC -G0  ${srcdir}/process.s;; \
        s390_*) \
-               /lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s390.s >process.ss; \
+               $(CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s390.s >process.ss; \
                ${AS} -ahlns process.ss -o process.o >process.lst; \
                $(RM) process.ss ;; \
        s390x_*) \
-               /lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s390x.s >process.ss; \
+               $(CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s390x.s >process.ss; \
                ${AS} -ahlns process.ss -o process.o >process.lst; \
                $(RM) process.ss ;; \
        *_darwin* ) \
@@ -88,11 +88,11 @@ process.o   : process.s process.i386.s process.c
                ${AS} process.ss -o process.o ;  \
                $(RM) -f process.S ;;\
        ncrx86_* | sunx86_*) \
-               /usr/ccs/lib/cpp -P -D__sun -D__i386 -DIGNORE_STDS_H -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
+               $(CPP) -P -D__sun -D__i386 -DIGNORE_STDS_H -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
                ${AS} -o process.o process.ss; \
                $(RM) process.ss ;; \
        alpha_nbsd* ) \
-               /usr/bin/cpp -DASSEMBLER -P -I${TOP_INCDIR} ${srcdir}/process.s > process.ss; \
+               $(CPP) -DASSEMBLER -P -I${TOP_INCDIR} ${srcdir}/process.s > process.ss; \
                ${AS} -o process.o process.ss; \
                $(RM) process.ss ;; \
        hp* | *_linux* | *_umlinux* | sgi_64 | sgi_65 ) \
@@ -103,11 +103,11 @@ process.o : process.s process.i386.s process.c
        ia64_hpux11* | hp_ux11* ) \
                ${CC} ${CFLAGS} -c ${srcdir}/process.c;; \
        i386_*) \
-               /lib/cpp -P -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
+               $(CPP) -P -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
                ${AS} process.ss -o process.o; \
                $(RM) process.ss ;; \
        *) \
-               /lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
+               $(CPP) -P -I${TOP_INCDIR} ${srcdir}/process.s process.ss; \
                ${AS} process.ss -o process.o; \
                $(RM) process.ss ;; \
        esac

diff --git a/src/rxgen/Makefile.in b/src/rxgen/Makefile.in
index b0915fa62f1bd0e190efd287076c461bdc71978b..a9cd97e2caab0b1c50b5d9bcad60dbcfe653b361 100644 (file)
--- a/src/rxgen/Makefile.in
+++ b/src/rxgen/Makefile.in
@@ -18,6 +18,9 @@ all: rxgen ${TOP_INCDIR}/afs/rxgen_consts.h
 rxgen: $(OBJS) AFS_component_version_number.c $(HDRS)
        $(CC) $(CFLAGS) $(OBJS) $(XLIBS) -o $@
 
+rpc_main.o: rpc_main.c
+       $(CCOBJ) $(CFLAGS) -c $< -D__PROG_CPP__="\"$(CPP)\""
+
 #
 # Install targets
 #

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 483f17fd99d16d14d94d38426f8be7646db362e3..2ac8b4f0e3daf3722309c08888250f4d12911060 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -98,14 +98,8 @@ char xflag = 0;                      /* if set, add stats code to stubs */
 char yflag = 0;                        /* if set, only emit function name arrays to xdr file */
 int debug = 0;
 static char *cmdname;
-#ifdef AFS_SUN5_ENV
-static char CPP[] = "/usr/ccs/lib/cpp";
-#elif defined(AFS_XBSD_ENV) || defined(AFS_DARWIN60_ENV)
-static char CPP[] = "/usr/bin/cpp";
-#elif defined(AFS_NT40_ENV)
-static char CPP[MAXCMDLINE];
-#elif defined(AFS_DARWIN_ENV)
-static char CPP[] = "cc -E";
+#ifdef __PROG_CPP__
+static char CPP[] = __PROG_CPP__;
 #else
 static char CPP[] = "/lib/cpp";
 #endif

diff --git a/src/shlibafsrpc/Makefile.in b/src/shlibafsrpc/Makefile.in
index e964d2613990877e7b8dba8037b9b88fcffec09b..2ad554545c06c6b58dfcbf7ab6a2047e59c80308 100644 (file)
--- a/src/shlibafsrpc/Makefile.in
+++ b/src/shlibafsrpc/Makefile.in
@@ -366,7 +366,7 @@ fasttime.o: ${LWP}/fasttime.c
 syscall.o: ${SYS}/syscall.s
        case "$(SYS_NAME)" in \
             sun4x_5* | sunx86_5*) \
-               /usr/ccs/lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* | *_darwin_* ) \
@@ -378,7 +378,7 @@ syscall.o: ${SYS}/syscall.s
         *fbsd* ) \
                touch syscall.o ;; \
         *) \
-               /lib/cpp  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
+               $(CPP)  ${SFLAGS} ${SYS}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index 9bd7e8c3bc5c6049d674057c7d1cb5a38c1c2206..a7fd936bee805db51673c2d409522973302a0a46 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -80,7 +80,7 @@ tests:        pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
 syscall.o: syscall.s
        @set -x; case "$(SYS_NAME)" in \
         sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53  | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sun4x_5?? | sunx86_5? | sunx86_5?? ) \
-               /usr/ccs/lib/cpp -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
+               $(CPP) -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
         sgi_* |*_darwin* ) \
@@ -96,7 +96,7 @@ syscall.o: syscall.s
                ${AS} syscall.S -o syscall.o ;  \
                $(RM) -f syscall.S ;;\
         *) \
-               /lib/cpp -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
+               $(CPP) -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
                as -o syscall.o syscall.ss;             \
                $(RM) syscall.ss;;                              \
        esac