diff --git a/aclocal.m4 b/aclocal.m4 index 9d5bb1c1..82656e52 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff --git a/configure b/configure index 9e639115..c05e224b 100755 --- a/configure +++ b/configure @@ -2032,9 +2032,7 @@ ac_config_headers="$ac_config_headers piler-config.h" CONFIGURE_PARAMS_FILE=params.h -rm -f $CONFIGURE_PARAMS_FILE -echo "#define CONFIGURE_PARAMS \"Build Date: "`date`"\\n\" \\" > $CONFIGURE_PARAMS_FILE -echo "\"Configure command: ./configure $@\"" >> $CONFIGURE_PARAMS_FILE +PARAMS=$@ ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3432,6 +3430,16 @@ MAKE="make" if test "$os" = "SunOS"; then MAKE="gmake"; fi +rm -f $CONFIGURE_PARAMS_FILE + +if test "$os" = "SunOS"; then + echo "#define CONFIGURE_PARAMS \"Build Date: "`date`'\\n" \\' > $CONFIGURE_PARAMS_FILE +else + echo "#define CONFIGURE_PARAMS \"Build Date: "`date`"\\n\" \\" > $CONFIGURE_PARAMS_FILE +fi +echo "\"Configure command: ./configure $PARAMS\"" >> $CONFIGURE_PARAMS_FILE + + SUBDIRS="src etc util init.d test" diff --git a/configure.in b/configure.in index adcd4421..e81a5703 100644 --- a/configure.in +++ b/configure.in @@ -4,9 +4,7 @@ AC_CONFIG_HEADER(piler-config.h) CONFIGURE_PARAMS_FILE=params.h -rm -f $CONFIGURE_PARAMS_FILE -echo "#define CONFIGURE_PARAMS \"Build Date: "`date`"\\n\" \\" > $CONFIGURE_PARAMS_FILE -echo "\"Configure command: ./configure $@\"" >> $CONFIGURE_PARAMS_FILE +PARAMS=$@ dnl Checks for programs. AC_PROG_CC @@ -58,6 +56,16 @@ MAKE="make" if test "$os" = "SunOS"; then MAKE="gmake"; fi +rm -f $CONFIGURE_PARAMS_FILE + +if test "$os" = "SunOS"; then + echo "#define CONFIGURE_PARAMS \"Build Date: "`date`'\\n" \\' > $CONFIGURE_PARAMS_FILE +else + echo "#define CONFIGURE_PARAMS \"Build Date: "`date`"\\n\" \\" > $CONFIGURE_PARAMS_FILE +fi +echo "\"Configure command: ./configure $PARAMS\"" >> $CONFIGURE_PARAMS_FILE + + dnl SUBDIRS="src etc util perl init.d templates history contrib/stat" SUBDIRS="src etc util init.d test"