From d660239ab6095390550a77278d9e991e3a386f57 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 28 Jun 2000 00:11:48 +0000 Subject: [PATCH] Look for md5 as well as md5sum. --- configure | 108 +++++++++++++++++++++++++++++++++------------------ configure.in | 1 + spec.sgml | 2 +- 3 files changed, 73 insertions(+), 38 deletions(-) diff --git a/configure b/configure index 914f612..4359deb 100755 --- a/configure +++ b/configure @@ -855,11 +855,44 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +for ac_prog in md5sum md5 +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:864: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_MD5SUM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$MD5SUM"; then + ac_cv_prog_MD5SUM="$MD5SUM" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MD5SUM="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MD5SUM="$ac_cv_prog_MD5SUM" +if test -n "$MD5SUM"; then + echo "$ac_t""$MD5SUM" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MD5SUM" && break +done + CFLAGS="$CFLAGS -D_GNU_SOURCE" echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:863: checking for socket in -lsocket" >&5 +echo "configure:896: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -867,7 +900,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -908,12 +941,12 @@ fi for ac_func in setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:912: checking for $ac_func" >&5 +echo "configure:945: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -962,12 +995,12 @@ done echo $ac_n "checking for EPROTO""... $ac_c" 1>&6 -echo "configure:966: checking for EPROTO" >&5 +echo "configure:999: checking for EPROTO" >&5 if eval "test \"`echo '$''{'userv_cv_hdr_eproto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -998,12 +1031,12 @@ EOF fi echo $ac_n "checking for LOG_AUTHPRIV""... $ac_c" 1>&6 -echo "configure:1002: checking for LOG_AUTHPRIV" >&5 +echo "configure:1035: checking for LOG_AUTHPRIV" >&5 if eval "test \"`echo '$''{'userv_cv_hdr_logauthpriv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1044,20 +1077,20 @@ fi echo $ac_n "checking your C compiler""... $ac_c" 1>&6 -echo "configure:1048: checking your C compiler" >&5 +echo "configure:1081: checking your C compiler" >&5 if eval "test \"`echo '$''{'dpkg_cv_c_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { strcmp("a","b") ; return 0; } EOF -if { (eval echo configure:1061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_c_works=yes else @@ -1082,20 +1115,20 @@ fi echo $ac_n "checking __attribute__((,,))""... $ac_c" 1>&6 -echo "configure:1086: checking __attribute__((,,))" >&5 +echo "configure:1119: checking __attribute__((,,))" >&5 if eval "test \"`echo '$''{'dpkg_cv_c_attribute_supported'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_c_attribute_supported=yes else @@ -1117,20 +1150,20 @@ EOF echo $ac_n "checking __attribute__((noreturn))""... $ac_c" 1>&6 -echo "configure:1121: checking __attribute__((noreturn))" >&5 +echo "configure:1154: checking __attribute__((noreturn))" >&5 if eval "test \"`echo '$''{'dpkg_cv_c_attribute_noreturn'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_c_attribute_noreturn=yes else @@ -1157,20 +1190,20 @@ EOF echo $ac_n "checking __attribute__((unused))""... $ac_c" 1>&6 -echo "configure:1161: checking __attribute__((unused))" >&5 +echo "configure:1194: checking __attribute__((unused))" >&5 if eval "test \"`echo '$''{'dpkg_cv_c_attribute_unused'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_c_attribute_unused=yes else @@ -1197,20 +1230,20 @@ EOF echo $ac_n "checking __attribute__((format...))""... $ac_c" 1>&6 -echo "configure:1201: checking __attribute__((format...))" >&5 +echo "configure:1234: checking __attribute__((format...))" >&5 if eval "test \"`echo '$''{'dpkg_cv_attribute_format'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_attribute_format=yes else @@ -1248,7 +1281,7 @@ CWARNS="" echo $ac_n "checking GCC warning flag(s) -Wall -Wno-implicit""... $ac_c" 1>&6 -echo "configure:1252: checking GCC warning flag(s) -Wall -Wno-implicit" >&5 +echo "configure:1285: checking GCC warning flag(s) -Wall -Wno-implicit" >&5 if test "${GCC-no}" = yes then if eval "test \"`echo '$''{'dpkg_cv_c_gcc_warn_all'+set}'`\" = set"; then @@ -1258,7 +1291,7 @@ else oldcflags="${CFLAGS-}" CFLAGS="${CFLAGS-} ${CWARNS} -Wall -Wno-implicit -Werror" cat > conftest.$ac_ext < @@ -1270,7 +1303,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_c_gcc_warn_all=yes else @@ -1296,7 +1329,7 @@ fi echo $ac_n "checking GCC warning flag(s) -Wwrite-strings""... $ac_c" 1>&6 -echo "configure:1300: checking GCC warning flag(s) -Wwrite-strings" >&5 +echo "configure:1333: checking GCC warning flag(s) -Wwrite-strings" >&5 if test "${GCC-no}" = yes then if eval "test \"`echo '$''{'dpkg_cv_c_gcc_warn_writestrings'+set}'`\" = set"; then @@ -1306,7 +1339,7 @@ else oldcflags="${CFLAGS-}" CFLAGS="${CFLAGS-} ${CWARNS} -Wwrite-strings -Werror" cat > conftest.$ac_ext < @@ -1318,7 +1351,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_c_gcc_warn_writestrings=yes else @@ -1344,7 +1377,7 @@ fi echo $ac_n "checking GCC warning flag(s) -Wpointer-arith""... $ac_c" 1>&6 -echo "configure:1348: checking GCC warning flag(s) -Wpointer-arith" >&5 +echo "configure:1381: checking GCC warning flag(s) -Wpointer-arith" >&5 if test "${GCC-no}" = yes then if eval "test \"`echo '$''{'dpkg_cv_c_gcc_warn_pointerarith'+set}'`\" = set"; then @@ -1354,7 +1387,7 @@ else oldcflags="${CFLAGS-}" CFLAGS="${CFLAGS-} ${CWARNS} -Wpointer-arith -Werror" cat > conftest.$ac_ext < @@ -1366,7 +1399,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_c_gcc_warn_pointerarith=yes else @@ -1392,7 +1425,7 @@ fi echo $ac_n "checking GCC warning flag(s) -Wimplicit -Wnested-externs""... $ac_c" 1>&6 -echo "configure:1396: checking GCC warning flag(s) -Wimplicit -Wnested-externs" >&5 +echo "configure:1429: checking GCC warning flag(s) -Wimplicit -Wnested-externs" >&5 if test "${GCC-no}" = yes then if eval "test \"`echo '$''{'dpkg_cv_c_gcc_warn_implicit'+set}'`\" = set"; then @@ -1402,7 +1435,7 @@ else oldcflags="${CFLAGS-}" CFLAGS="${CFLAGS-} ${CWARNS} -Wimplicit -Wnested-externs -Werror" cat > conftest.$ac_ext < @@ -1414,7 +1447,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* dpkg_cv_c_gcc_warn_implicit=yes else @@ -1585,6 +1618,7 @@ s%@CC@%$CC%g s%@CPP@%$CPP%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@MD5SUM@%$MD5SUM%g s%@OPTIMISE@%$OPTIMISE%g s%@CWARNS@%$CWARNS%g s%@VERSION@%$VERSION%g diff --git a/configure.in b/configure.in index f58fcb4..4aa9797 100644 --- a/configure.in +++ b/configure.in @@ -41,6 +41,7 @@ AC_ARG_ENABLE(debug, AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL +AC_CHECK_PROGS(MD5SUM, md5sum md5) CFLAGS="$CFLAGS -D_GNU_SOURCE" diff --git a/spec.sgml b/spec.sgml index e06e28e..7b4d4c4 100644 --- a/spec.sgml +++ b/spec.sgml @@ -3,7 +3,7 @@ User service daemon and client specification <author>Ian Jackson <email>ian@davenant.greenend.org.uk -<version>1.0.0</version> +<version>1.0.1</version> <abstract> This is a specification for a Unix system facility to allow one -- 2.30.2