diff options
| -rwxr-xr-x | configure | 82 | ||||
| -rw-r--r-- | configure.in | 12 |
2 files changed, 44 insertions, 50 deletions
@@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.9 +# From configure.in Revision: 1.10 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.12 @@ -1004,7 +1004,7 @@ fp = open("conftest.out", "w") fp.write("%s\n" % gid) fp.close() EOF - python conftest.py + $PYTHON conftest.py MAIL_GID=`cat conftest.out` fi @@ -1012,16 +1012,14 @@ if test -z "$MAIL_GID" then { echo "configure: error: -***** Group $with_mail_gid not found! You must first -***** set up the $with_mail_gid entry in /etc/group -***** or set the MAIL_GID shell variable on the -***** configure command line" 1>&2; exit 1; } +***** No group for the mail_wrapper program found! +***** Please see the INSTALL file for details" 1>&2; exit 1; } fi echo "$ac_t""$MAIL_GID" 1>&6 rm -f conftest.out conftest.py echo $ac_n "checking for --with-cgi-gid""... $ac_c" 1>&6 -echo "configure:1025: checking for --with-cgi-gid" >&5 +echo "configure:1023: checking for --with-cgi-gid" >&5 # Check whether --with-cgi-gid or --without-cgi-gid was given. if test "${with_cgi_gid+set}" = set; then withval="$with_cgi_gid" @@ -1038,7 +1036,7 @@ echo "$ac_t""$with_cgi_gid" 1>&6 # $with_cgi_gid == user id to check for # cgi_wrapper == purpose echo $ac_n "checking for cgi_wrapper GID""... $ac_c" 1>&6 -echo "configure:1042: checking for cgi_wrapper GID" >&5 +echo "configure:1040: checking for cgi_wrapper GID" >&5 if test -z "$CGI_GID" @@ -1060,7 +1058,7 @@ fp = open("conftest.out", "w") fp.write("%s\n" % gid) fp.close() EOF - python conftest.py + $PYTHON conftest.py CGI_GID=`cat conftest.out` fi @@ -1068,10 +1066,8 @@ if test -z "$CGI_GID" then { echo "configure: error: -***** Group $with_cgi_gid not found! You must first -***** set up the $with_cgi_gid entry in /etc/group -***** or set the CGI_GID shell variable on the -***** configure command line" 1>&2; exit 1; } +***** No group for the cgi_wrapper program found! +***** Please see the INSTALL file for details" 1>&2; exit 1; } fi echo "$ac_t""$CGI_GID" 1>&6 rm -f conftest.out conftest.py @@ -1109,17 +1105,17 @@ else: fp.write('please.change.me\nwww.please.change.me\n') fp.close() EOF -python conftest.py +$PYTHON conftest.py echo $ac_n "checking for default fully qualified host name""... $ac_c" 1>&6 -echo "configure:1116: checking for default fully qualified host name" >&5 +echo "configure:1112: checking for default fully qualified host name" >&5 if test -z "$FQDN" then FQDN=`head -1 conftest.out` fi echo "$ac_t""$FQDN" 1>&6 echo $ac_n "checking for default URL host component""... $ac_c" 1>&6 -echo "configure:1123: checking for default URL host component" >&5 +echo "configure:1119: checking for default URL host component" >&5 if test -z "$URL" then URL=`tail -1 conftest.out` @@ -1131,7 +1127,7 @@ rm -f conftest.out conftest.py # Checks for header files. echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1135: checking how to run the C preprocessor" >&5 +echo "configure:1131: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1146,13 +1142,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1150 "configure" +#line 1146 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1163,13 +1159,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1167 "configure" +#line 1163 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1192,12 +1188,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1196: checking for ANSI C header files" >&5 +echo "configure:1192: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1201 "configure" +#line 1197 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1205,7 +1201,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1222,7 +1218,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1226 "configure" +#line 1222 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1240,7 +1236,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1244 "configure" +#line 1240 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1261,7 +1257,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1265 "configure" +#line 1261 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1272,7 +1268,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1299,17 +1295,17 @@ for ac_hdr in syslog.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1303: checking for $ac_hdr" >&5 +echo "configure:1299: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1308 "configure" +#line 1304 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1338,12 +1334,12 @@ done # Checks for typedefs, structures, and compiler characteristics. echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:1342: checking for uid_t in sys/types.h" >&5 +echo "configure:1338: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1347 "configure" +#line 1343 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -1372,7 +1368,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:1376: checking type of array argument to getgroups" >&5 +echo "configure:1372: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1380,7 +1376,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 1384 "configure" +#line 1380 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -1405,7 +1401,7 @@ main() } EOF -if { (eval echo configure:1409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -1419,7 +1415,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 1423 "configure" +#line 1419 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -1445,12 +1441,12 @@ EOF # Checks for library functions. echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1449: checking for vprintf" >&5 +echo "configure:1445: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1454 "configure" +#line 1450 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -1473,7 +1469,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:1477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1497,12 +1493,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1501: checking for _doprnt" >&5 +echo "configure:1497: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1506 "configure" +#line 1502 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -1525,7 +1521,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:1529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else diff --git a/configure.in b/configure.in index 7daefb17f..24743c7c2 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Revision: 704 $) +AC_REVISION($Revision: 705 $) AC_PREREQ(2.0) AC_INIT(src/alias-wrapper.c) @@ -133,7 +133,7 @@ fp = open("conftest.out", "w") fp.write("%s\n" % gid) fp.close() EOF - python conftest.py + $PYTHON conftest.py $1=`cat conftest.out` fi changequote([, ]) @@ -141,10 +141,8 @@ if test -z "$$1" then AC_MSG_ERROR([ -***** Group $2 not found! You must first -***** set up the $2 entry in /etc/group -***** or set the $1 shell variable on the -***** configure command line]) +***** No group for the $3 program found! +***** Please see the INSTALL file for details]) fi AC_MSG_RESULT($$1) rm -f conftest.out conftest.py]) @@ -204,7 +202,7 @@ else: fp.write('please.change.me\nwww.please.change.me\n') fp.close() EOF -python conftest.py +$PYTHON conftest.py changequote([, ]) AC_MSG_CHECKING(for default fully qualified host name) if test -z "$FQDN" |