Date: Sunday, May 17, 2009 @ 13:30:23
Author: iulius
Revision: 8475
* Use Autoconf checks to find the path to awk, egrep, 'mkdir -p'
and sed.
* Add the inn-workers mailing-list address for bugs reports.
Modified:
trunk/Makefile
trunk/Makefile.global.in
trunk/configure.ac
trunk/m4/prog-ensure.m4
--------------------+
Makefile | 4 ++--
Makefile.global.in | 1 +
configure.ac | 9 +++++++--
m4/prog-ensure.m4 | 4 +++-
4 files changed, 13 insertions(+), 5 deletions(-)
Modified: Makefile
===================================================================
--- Makefile 2009-05-17 13:12:15 UTC (rev 8474)
+++ Makefile 2009-05-17 20:30:23 UTC (rev 8475)
@@ -206,7 +206,7 @@
rm -rf $(TARDIR)
rm -f inn*.tar.gz
mkdir $(TARDIR)
- for d in `$(SED) $(DISTDIRS) MANIFEST` ; do mkdir -p $$d ; done
+ for d in `$(SED) $(DISTDIRS) MANIFEST` ; do $(MKDIR_P) $$d ; done
for f in `$(SED) $(DISTFILES) MANIFEST` ; do \
cp $$f $(TARDIR)/$$f || exit 1 ; \
done
@@ -245,7 +245,7 @@
rm -rf $(SNAPDIR)
rm -f inn*.tar.gz
mkdir $(SNAPDIR)
- set -e ; for d in `$(SED) $(SNAPDIRS) MANIFEST` ; do mkdir -p $$d ; done
+ set -e ; for d in `$(SED) $(SNAPDIRS) MANIFEST` ; do $(MKDIR_P) $$d ; done
set -e ; for f in `$(SED) $(DISTFILES) MANIFEST` ; do \
cp $$f $(SNAPDIR)/$$f ; \
done
Modified: Makefile.global.in
===================================================================
--- Makefile.global.in 2009-05-17 13:12:15 UTC (rev 8474)
+++ Makefile.global.in 2009-05-17 20:30:23 UTC (rev 8475)
@@ -191,6 +191,7 @@
GZIP = @GZIP@
LEX = @LEX@
LN_S = @LN_S@
+MKDIR_P = @MKDIR_P@
PERL = @PERL@
RANLIB = @RANLIB@
SED = @SED@
Modified: configure.ac
===================================================================
--- configure.ac 2009-05-17 13:12:15 UTC (rev 8474)
+++ configure.ac 2009-05-17 20:30:23 UTC (rev 8475)
@@ -26,7 +26,7 @@
dnl useful information for someone debugging a problem than configure-time
dnl errors.
-AC_INIT([INN], [2.5.0])
+AC_INIT([INN], [2.5.0], [inn-workers at lists.isc.org])
AC_PREREQ(2.61)
AC_REVISION($Revision$)
AC_CONFIG_AUX_DIR([support])
@@ -206,6 +206,7 @@
AC_PROG_LEX
AC_PROG_LN_S
AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
AC_PROG_RANLIB
AC_PROG_YACC
@@ -251,7 +252,8 @@
fi
esac
-dnl Checks for pathnames.
+dnl Checks for pathnames. If AC_PROG_* does not manage to find a working
+dnl program, INN_PATH_PROG_ENSURE will output an error.
AC_ARG_VAR([AWK], [Location of awk])
AC_ARG_VAR([EGREP], [Location of egrep])
AC_ARG_VAR([SED], [Location of sed])
@@ -259,6 +261,9 @@
AC_ARG_VAR([SSLBIN], [Location of openssl])
AC_ARG_VAR([UUSTAT], [Location of uustat])
AC_ARG_VAR([UUX], [Location of uux])
+AC_PROG_AWK
+AC_PROG_EGREP
+AC_PROG_SED
INN_PATH_PROG_ENSURE([AWK], [awk])
INN_PATH_PROG_ENSURE([EGREP], [egrep])
INN_PATH_PROG_ENSURE([SED], [sed])
Modified: m4/prog-ensure.m4
===================================================================
--- m4/prog-ensure.m4 2009-05-17 13:12:15 UTC (rev 8474)
+++ m4/prog-ensure.m4 2009-05-17 20:30:23 UTC (rev 8475)
@@ -5,7 +5,9 @@
dnl searched for is found in the user's PATH.
AC_DEFUN([INN_PATH_PROG_ENSURE],
-[AC_PATH_PROG([$1], [$2])
+[if test x"${$1}" = x ; then
+ AC_PATH_PROG([$1], [$2])
+fi
if test x"${$1}" = x ; then
AC_MSG_ERROR([$2 was not found in path and is required])
fi])