From 35c228531bc8e00d43be590255df9408a4fcbe19 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Tue, 8 Nov 2005 16:51:34 +0000 Subject: [PATCH] replace obsolete autoconf macros --- ChangeLog | 5 +++ Makefile.in | 4 +- config/Makefile.in | 2 +- configure.in | 100 +++++++++++++++++++++++++------------------------- docs/Makefile.in | 2 +- etc/Makefile.in | 2 +- h/Makefile.in | 2 +- man/Makefile.in | 2 +- mts/Makefile.in | 2 +- mts/smtp/Makefile.in | 2 +- mts/smtp/smtp.c | 2 +- sbr/Makefile.in | 4 +- uip/Makefile.in | 2 +- 13 files changed, 69 insertions(+), 62 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca22c28..9eadf32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-08 Oliver Kiddle + + * configure.in, */Makefile.in, mts/smtp/smtp.c: replace obsolete + autoconf macros + 2005-11-06 Peter Maydell * sbr/fmt_rfc2047.c, sbr/fmt_scan.c, h/prototypes.h: fix various diff --git a/Makefile.in b/Makefile.in index 7cd91b0..fe8a221 100644 --- a/Makefile.in +++ b/Makefile.in @@ -130,7 +130,7 @@ lint: # ========== DEPENDENCIES FOR MAINTENANCE ========== Makefile: Makefile.in config.status - CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status + ./config.status $@ config.status: configure VERSION ./config.status --recheck @@ -140,7 +140,7 @@ configure: configure.in aclocal.m4 config.h: stamp-h stamp-h: config.h.in config.status - CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status + ./config.status config.h stamp config.h.in: stamp-h.in stamp-h.in: configure.in acconfig.h aclocal.m4 diff --git a/config/Makefile.in b/config/Makefile.in index 6776c86..482bca2 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -86,7 +86,7 @@ superclean: realclean subdir = config Makefile: Makefile.in ../config.status - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd .. && ./config.status $(subdir)/$@ distdir = ../`cat ../distname`/$(subdir) nmhdist: $(DIST) diff --git a/configure.in b/configure.in index ea664e9..9b8c568 100644 --- a/configure.in +++ b/configure.in @@ -10,10 +10,11 @@ dnl so require that. If there are bug reports about 2.50-2.52 not working dnl we can always move this up a little. AC_PREREQ(2.50) -AC_INIT(h/nmh.h) +AC_INIT(nmh, m4_normalize(m4_include([VERSION]))) +AC_CONFIG_SRCDIR(h/nmh.h) AC_CONFIG_HEADER(config.h) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET dnl --------------------- dnl define a macro or two @@ -29,11 +30,8 @@ if test -n "$LIBTOOL" ; then fi ] ) - -dnl What version of nmh are we building? -VERSION=`sed -e 's/nmh-//' ${srcdir}/VERSION` -echo "configuring for nmh-$VERSION" -AC_SUBST(VERSION)dnl +echo "configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION" +AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl dnl What date of nmh are we building? DATE=`cat ${srcdir}/DATE` @@ -451,25 +449,24 @@ AC_HEADER_STAT AC_CHECK_HEADERS(string.h memory.h stdlib.h unistd.h errno.h fcntl.h \ limits.h crypt.h termcap.h termio.h termios.h locale.h \ langinfo.h netdb.h sys/param.h sys/time.h sys/utsname.h \ - iconv.h arpa/inet.h arpa/ftp.h) + iconv.h sys/stream.h arpa/inet.h arpa/ftp.h) AC_CACHE_CHECK(POSIX termios, nmh_cv_sys_posix_termios, -[AC_TRY_LINK([#include +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include #include -#include ], -[/* SunOS 4.0.3 has termios.h but not the library calls. */ -tcgetattr(0, 0);], - nmh_cv_sys_posix_termios=yes, nmh_cv_sys_posix_termios=no)]) +#include ]], +[[/* SunOS 4.0.3 has termios.h but not the library calls. */ +tcgetattr(0, 0);]])], +nmh_cv_sys_posix_termios=yes, nmh_cv_sys_posix_termios=no)]) if test $nmh_cv_sys_posix_termios = yes; then AC_CACHE_CHECK(TIOCGWINSZ in termios.h, nmh_cv_header_termios_h_tiocgwinsz, - [AC_TRY_LINK([#include -#include ], - [int x = TIOCGWINSZ;], - nmh_cv_header_termios_h_tiocgwinsz=yes, - nmh_cv_header_termios_h_tiocgwinsz=no)]) + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include +#include ]], + [[int x = TIOCGWINSZ;]])], + nmh_cv_header_termios_h_tiocgwinsz=yes,nmh_cv_header_termios_h_tiocgwinsz=no)]) else nmh_cv_header_termios_h_tiocgwinsz=no fi @@ -477,11 +474,10 @@ fi if test $nmh_cv_header_termios_h_tiocgwinsz = no; then AC_CACHE_CHECK(TIOCGWINSZ in sys/ioctl.h, nmh_cv_header_sys_ioctl_h_tiocgwinsz, - [AC_TRY_LINK([#include -#include ], - [int x = TIOCGWINSZ;], - nmh_cv_header_sys_ioctl_h_tiocgwinsz=yes, - nmh_cv_header_sys_ioctl_h_tiocgwinsz=no)]) + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include +#include ]], + [[int x = TIOCGWINSZ;]])], + nmh_cv_header_sys_ioctl_h_tiocgwinsz=yes,nmh_cv_header_sys_ioctl_h_tiocgwinsz=no)]) if test $nmh_cv_header_sys_ioctl_h_tiocgwinsz = yes; then AC_DEFINE(GWINSZ_IN_SYS_IOCTL)dnl fi @@ -496,7 +492,11 @@ AC_CHECK_HEADER(libio.h, [ AC_EGREP_HEADER(_IO_write_ptr, libio.h, [ AC_DEFINE(LINUX_STDIO) ]) ]) -AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM)) +AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM),, +[[#if HAVE_SYS_STREAM_H +# include +#endif +]]) dnl --------------- dnl CHECK FUNCTIONS @@ -513,8 +513,9 @@ AC_CHECK_FUNC(gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)], dnl sigsetjmp may be a macro AC_MSG_CHECKING(for sigsetjmp) -AC_TRY_LINK([#include ], [sigsetjmp((void *)0, 0);], - [AC_DEFINE(HAVE_SIGSETJMP) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no)) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[sigsetjmp((void *)0, 0);]])],[AC_DEFINE(HAVE_SIGSETJMP) AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) AC_REPLACE_FUNCS(snprintf strerror strdup) @@ -568,6 +569,11 @@ if test "x$ac_cv_header_iconv_h" = "xyes"; then if test "x$ac_found_iconv" != "xno"; then LIBS="-liconv $LIBS" fi + else + dnl Handle case where there is a native iconv but iconv.h is from libiconv + AC_CHECK_DECL(_libiconv_version, + [ AC_CHECK_LIB(iconv, libiconv, LIBS="-liconv $LIBS") ],, + [ #include ]) fi fi if test "x$ac_found_iconv" = xyes; then @@ -705,23 +711,21 @@ LIBS="$TERMLIB $LIBS" dnl Checks for external variable ospeed in the termcap library. AC_CACHE_CHECK(if an include file defines ospeed, nmh_cv_decl_ospeed_include_defines, -[AC_TRY_LINK( -[#include +[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include #if HAVE_TERMIOS_H #include #endif #if HAVE_TERMCAP_H #include -#endif], [ospeed = 0;], -nmh_cv_decl_ospeed_include_defines=yes, -nmh_cv_decl_ospeed_include_defines=no)]) +#endif]], [[ospeed = 0;]])], +nmh_cv_decl_ospeed_include_defines=yes,nmh_cv_decl_ospeed_include_defines=no)]) if test $nmh_cv_decl_ospeed_include_defines = no; then AC_CACHE_CHECK(if you must define ospeed, nmh_cv_decl_ospeed_must_define, - [AC_TRY_LINK( ,[extern short ospeed; ospeed = 0;], - nmh_cv_decl_ospeed_must_define=yes, - nmh_cv_decl_ospeed_must_define=no)]) + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], + [[extern short ospeed; ospeed = 0;]])], + nmh_cv_decl_ospeed_must_define=yes,nmh_cv_decl_ospeed_must_define=no)]) fi if test $nmh_cv_decl_ospeed_include_defines = yes; then @@ -761,10 +765,9 @@ dnl Check for sigset_t. Currently I'm looking in dnl and . Others might need dnl to be added. AC_CACHE_CHECK(for sigset_t, nmh_cv_type_sigset_t, -[AC_TRY_COMPILE( -[#include -#include ], [sigset_t tempsigset;], - nmh_cv_type_sigset_t=yes, nmh_cv_type_sigset_t=no)]) +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include +#include ]], [[sigset_t tempsigset;]])], +nmh_cv_type_sigset_t=yes,nmh_cv_type_sigset_t=no)]) if test $nmh_cv_type_sigset_t = no; then AC_DEFINE(sigset_t, unsigned int) fi @@ -772,11 +775,10 @@ fi dnl ---------------- dnl CHECK STRUCTURES dnl ---------------- -AC_STRUCT_ST_BLKSIZE +AC_CHECK_MEMBERS(struct stat.st_blksize) AC_CACHE_CHECK(for tm_gmtoff in struct tm, nmh_cv_struct_tm_gmtoff, -[AC_TRY_COMPILE( -[#ifdef TIME_WITH_SYS_TIME +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef TIME_WITH_SYS_TIME # include # include #else @@ -785,9 +787,8 @@ AC_CACHE_CHECK(for tm_gmtoff in struct tm, nmh_cv_struct_tm_gmtoff, # else # include # endif -#endif], -[struct tm temptm; temptm.tm_gmtoff = 0;], - nmh_cv_struct_tm_gmtoff=yes, nmh_cv_struct_tm_gmtoff=no)]) +#endif]], [[struct tm temptm; temptm.tm_gmtoff = 0;]])], +nmh_cv_struct_tm_gmtoff=yes,nmh_cv_struct_tm_gmtoff=no)]) if test $nmh_cv_struct_tm_gmtoff = yes; then AC_DEFINE(HAVE_TM_GMTOFF) fi @@ -883,10 +884,11 @@ esac dnl ---------------- dnl OUTPUT MAKEFILES dnl ---------------- -AC_OUTPUT(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \ - mts/Makefile mts/smtp/Makefile \ - etc/Makefile docs/Makefile man/Makefile, \ - [test -z "$CONFIG_HEADERS" || echo > stamp-h]) +AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \ + mts/Makefile mts/smtp/Makefile \ + etc/Makefile docs/Makefile man/Makefile) +AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h]) +AC_OUTPUT dnl Umm, what's the point of these assignments?? -- eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}" @@ -912,7 +914,7 @@ fi echo " nmh configuration ----------------- -nmh version : ${VERSION} +nmh version : AC_PACKAGE_VERSION target os : ${target} compiler : ${CC} compiler flags : ${CFLAGS} diff --git a/docs/Makefile.in b/docs/Makefile.in index aaf0fe4..7421f21 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -51,7 +51,7 @@ superclean: realclean subdir = docs Makefile: Makefile.in ../config.status - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd .. && ./config.status $(subdir)/$@ distdir = ../`cat ../distname`/$(subdir) nmhdist: diff --git a/etc/Makefile.in b/etc/Makefile.in index d50fcf7..20ea6d5 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -147,7 +147,7 @@ superclean: realclean subdir = etc Makefile: Makefile.in ../config.status - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd .. && ./config.status $(subdir)/$@ distdir = ../`cat ../distname`/$(subdir) nmhdist: $(DIST) diff --git a/h/Makefile.in b/h/Makefile.in index 6cf88b6..b859266 100644 --- a/h/Makefile.in +++ b/h/Makefile.in @@ -50,7 +50,7 @@ superclean: realclean subdir = h Makefile: Makefile.in ../config.status - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd .. && ./config.status $(subdir)/$@ distdir = ../`cat ../distname`/$(subdir) nmhdist: $(DIST) diff --git a/man/Makefile.in b/man/Makefile.in index 3b0fb65..ad2b458 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -197,7 +197,7 @@ lint: subdir = man Makefile: Makefile.in ../config.status - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd .. && ./config.status $(subdir)/$@ distdir = ../`cat ../distname`/$(subdir) nmhdist: $(DIST) diff --git a/mts/Makefile.in b/mts/Makefile.in index c72f350..fcec813 100644 --- a/mts/Makefile.in +++ b/mts/Makefile.in @@ -97,7 +97,7 @@ lint: subdir = mts Makefile: Makefile.in ../config.status - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd .. && ./config.status $(subdir)/$@ distdir = ../`cat ../distname`/$(subdir) nmhdist: $(DIST) diff --git a/mts/smtp/Makefile.in b/mts/smtp/Makefile.in index 341f0b1..f8b0ed3 100644 --- a/mts/smtp/Makefile.in +++ b/mts/smtp/Makefile.in @@ -79,7 +79,7 @@ lint: subdir = mts/smtp Makefile: Makefile.in ../../config.status - cd ../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd ../.. && ./config.status $(subdir)/$@ distdir = ../../`cat ../../distname`/$(subdir) nmhdist: $(DIST) diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c index 63aef40..da02701 100644 --- a/mts/smtp/smtp.c +++ b/mts/smtp/smtp.c @@ -959,7 +959,7 @@ bad_data: free (cp); { -#ifdef HAVE_ST_BLKSIZE +#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE struct stat st; if (fstat (fileno (sm_wfp), &st) == NOTOK || (cc = st.st_blksize) < BUFSIZ) diff --git a/sbr/Makefile.in b/sbr/Makefile.in index 1e5be90..142c721 100644 --- a/sbr/Makefile.in +++ b/sbr/Makefile.in @@ -131,7 +131,7 @@ mostlyclean: rm -f *.o *~ clean: mostlyclean - rm -f libmh.a sigmsg.h + rm -f libmh.a sigmsg.h dtimep.c distclean: clean rm -f Makefile @@ -145,7 +145,7 @@ superclean: realclean subdir = sbr Makefile: Makefile.in ../config.status - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd .. && ./config.status $(subdir)/$@ distdir = ../`cat ../distname`/$(subdir) nmhdist: $(DIST) diff --git a/uip/Makefile.in b/uip/Makefile.in index 6bdd4eb..a711a92 100644 --- a/uip/Makefile.in +++ b/uip/Makefile.in @@ -327,7 +327,7 @@ lint: subdir = uip Makefile: Makefile.in ../config.status - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd .. && ./config.status $(subdir)/$@ distdir = ../`cat ../distname`/$(subdir) nmhdist: $(DIST) -- 1.7.10.4