DEVEL15-linux-allow-disabling-syscall-probing-20090602

[openafs.git] / configure.in

diff --git a/configure.in b/configure.in
index c4637be..c3c6d6a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 AC_INIT(src/config/stds.h)
-AM_INIT_AUTOMAKE(openafs,1.5.36)
+AM_INIT_AUTOMAKE(openafs,1.5.60)
 AC_CONFIG_HEADER(src/config/afsconfig.h)
-MACOS_VERSION=1.5.36
-LINUX_PKGVER=1.5.36
+MACOS_VERSION=1.5.60
+LINUX_PKGVER=1.5.60
 #LINUX_PKGREL=0.pre0
 LINUX_PKGREL=1.1
 
@@ -11,7 +11,8 @@ AC_SUBST(LINUX_PKGVER)
 AC_SUBST(LINUX_PKGREL)
 
 AC_PROG_CC
-AC_CHECK_PROGS(CPP,[/lib/cpp /usr/bin/cpp /usr/ccs/lib/cpp cpp],,[$PATH:/])
+AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
+AC_SUBST([PATH_CPP])
 OPENAFS_CONFIGURE_COMMON
 
 if test -d 'doc/man-pages' ; then
@@ -19,10 +20,28 @@ if test -d 'doc/man-pages' ; then
 else
     MAN_MAKEFILE=
 fi
+if test -f 'doc/xml/AdminGuide/Makefile.in' ; then
+   ADMINGUIDE_MAKEFILE="doc/xml/AdminGuide/Makefile"
+else
+   ADMINGUIDE_MAKEFILE=
+fi
+if test -f 'doc/xml/QuickStartUnix/Makefile.in' ; then
+   QSUNIX_MAKEFILE="doc/xml/QuickStartUnix/Makefile"
+else
+   QSUNIX_MAKEFILE=
+fi
+if test -f 'doc/xml/UserGuide/Makefile.in' ; then
+   USERGUIDE_MAKEFILE="doc/xml/UserGuide/Makefile"
+else
+   USERGUIDE_MAKEFILE=
+fi
 
 AC_OUTPUT(             \
 Makefile               \
 ${MAN_MAKEFILE} \
+${ADMINGUIDE_MAKEFILE} \
+${QSUNIX_MAKEFILE} \
+${USERGUIDE_MAKEFILE} \
 src/afs/Makefile \
 src/afsd/Makefile \
 src/afsmonitor/Makefile \
@@ -46,6 +65,7 @@ src/comerr/Makefile \
 src/comerr/test/Makefile \
 src/config/Makefile \
 src/config/Makefile.config \
+src/config/Makefile.version-CML \
 src/config/Makefile.version-NOCML \
 src/dauth/Makefile \
 src/des/Makefile \