nmh-workers
[Top] [All Lists]

Re: [Nmh-workers] Re: 1.1RC4: can't rebuild dtimep.c with modern flex

2005-11-08 08:23:22
On 5 Nov, pmaydell@chiark.greenend.org.uk wrote:
[not sent to list since it's a debian package specific thing]

I hope you don't mind me replying via the list and quoting your message
but I get a delivery failure when sending directly:
  ... while talking to mx-relay.chiark.greenend.org.uk.:
  <<< 550 HELO name lookup revealed misconfiguration: Error during DNS A lookup 
for rly11e.srv.mailcontrol.com: DNS alias found where canonical name wanted 
[Irritated]
 
Oliver Kiddle wrote:
2, 4, 6, 7: already fixed in CVS (6 is the vfork issue)
1 (194349) & 3 (261089): man page sections: distribution specific
5 (238456) : probably should apply. is the duplicate install-mh needed?
8 (320090) : Makefile fix for flex, should apply
9 (320069) : KPOP fixes, probably should apply
10 (289506): libdb, probably Debian specific

I just noticed that this list misses the patch to configure.in
which is in the nmh_1.1-release-4.diff.gz 'raw' rather than as
a debian/patches/ patch. Do you know if it not being a debian/patches/
patch is just an oversight? (For that matter, do you know what it's
for? :-))

It appears to be the result of running autoupdate. That replaces some of
the obsolete autoconf macros in configure.in. I would guess that it is
not in debian/patches because it can be recreated with autoupdate at any
point.

I've had a look through the changes manually along with the autoconf
manual and have put together a patch that replaces all the obsolete
macro uses. The patch is attached. It also includes a bit to remove the
lex output on make clean and fixes a minor problem in the iconv
detection that I added earlier this year.

Oliver

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/Makefile.in,v
retrieving revision 1.11
diff -u -r1.11 Makefile.in
--- Makefile.in 30 Dec 2000 09:51:55 -0000      1.11
+++ Makefile.in 8 Nov 2005 13:57:51 -0000
@@ -130,7 +130,7 @@
 # ========== 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 @@
 
 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
Index: configure.in
===================================================================
RCS file: /cvsroot/nmh/nmh/configure.in,v
retrieving revision 1.68
diff -u -r1.68 configure.in
--- configure.in        6 Nov 2005 00:23:48 -0000       1.68
+++ configure.in        8 Nov 2005 13:57:51 -0000
@@ -10,10 +10,11 @@
 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 @@
 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`
@@ -455,21 +453,20 @@
 
 
 AC_CACHE_CHECK(POSIX termios, nmh_cv_sys_posix_termios,
-[AC_TRY_LINK([#include <sys/types.h>
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <unistd.h>
-#include <termios.h>],
-[/* 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 <termios.h>]],
+[[/* 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 <sys/types.h>
-#include <termios.h>],
-  [int x = TIOCGWINSZ;],
-  nmh_cv_header_termios_h_tiocgwinsz=yes,
-  nmh_cv_header_termios_h_tiocgwinsz=no)])
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <termios.h>]],
+  [[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 @@
 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 <sys/types.h>
-#include <sys/ioctl.h>],
-  [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 <sys/types.h>
+#include <sys/ioctl.h>]],
+  [[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
@@ -513,8 +509,9 @@
 
 dnl sigsetjmp may be a macro
 AC_MSG_CHECKING(for sigsetjmp)
-AC_TRY_LINK([#include <setjmp.h>], [sigsetjmp((void *)0, 0);],
-        [AC_DEFINE(HAVE_SIGSETJMP) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <setjmp.h>]],
+  [[sigsetjmp((void *)0, 0);]])],[AC_DEFINE(HAVE_SIGSETJMP) 
AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)])
 
 AC_REPLACE_FUNCS(snprintf strerror strdup)
 
@@ -568,6 +565,11 @@
     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 <iconv.h> ])
   fi
 fi
 if test "x$ac_found_iconv" = xyes; then
@@ -705,23 +707,21 @@
 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 <sys/types.h>
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #if HAVE_TERMIOS_H
 #include <termios.h>
 #endif
 #if HAVE_TERMCAP_H
 #include <termcap.h>
-#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 +761,9 @@
 dnl <sys/types.h> and <signal.h>.  Others might need
 dnl to be added.
 AC_CACHE_CHECK(for sigset_t, nmh_cv_type_sigset_t,
-[AC_TRY_COMPILE(
-[#include <sys/types.h>
-#include <signal.h>], [sigset_t tempsigset;],
-  nmh_cv_type_sigset_t=yes, nmh_cv_type_sigset_t=no)])
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <signal.h>]], [[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 +771,10 @@
 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 <sys/time.h>
 # include <time.h>
 #else
@@ -785,9 +783,8 @@
 # else
 #  include <time.h>
 # 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 +880,11 @@
 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??  -- 
<dan-nmh@dilvish.speed.net>
 eval "nmhbin=${bindir}";         eval "nmhbin2=${nmhbin}"
@@ -912,7 +910,7 @@
 echo "
 nmh configuration
 -----------------
-nmh version                : ${VERSION}
+nmh version                : AC_PACKAGE_VERSION
 target os                  : ${target}
 compiler                   : ${CC}
 compiler flags             : ${CFLAGS}
Index: config/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/config/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- config/Makefile.in  31 May 2000 05:48:07 -0000      1.2
+++ config/Makefile.in  8 Nov 2005 13:57:51 -0000
@@ -86,7 +86,7 @@
 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)
Index: docs/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/docs/Makefile.in,v
retrieving revision 1.6
diff -u -r1.6 Makefile.in
--- docs/Makefile.in    2 Nov 2005 17:16:39 -0000       1.6
+++ docs/Makefile.in    8 Nov 2005 13:57:51 -0000
@@ -51,7 +51,7 @@
 subdir = docs
 
 Makefile: Makefile.in ../config.status
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+       cd .. && ./config.status $(subdir)/$@
  
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: 
Index: etc/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/etc/Makefile.in,v
retrieving revision 1.13
diff -u -r1.13 Makefile.in
--- etc/Makefile.in     1 Aug 2000 14:55:53 -0000       1.13
+++ etc/Makefile.in     8 Nov 2005 13:57:51 -0000
@@ -147,7 +147,7 @@
 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)
Index: h/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/h/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- h/Makefile.in       14 Dec 2000 01:30:44 -0000      1.4
+++ h/Makefile.in       8 Nov 2005 13:57:51 -0000
@@ -50,7 +50,7 @@
 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)
Index: man/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/man/Makefile.in,v
retrieving revision 1.16
diff -u -r1.16 Makefile.in
--- man/Makefile.in     23 Jun 2003 00:44:28 -0000      1.16
+++ man/Makefile.in     8 Nov 2005 13:57:51 -0000
@@ -197,7 +197,7 @@
 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)
Index: mts/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/mts/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- mts/Makefile.in     14 Dec 2000 01:30:44 -0000      1.5
+++ mts/Makefile.in     8 Nov 2005 13:57:51 -0000
@@ -97,7 +97,7 @@
 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)
Index: mts/smtp/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/mts/smtp/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- mts/smtp/Makefile.in        8 Sep 2000 00:31:00 -0000       1.7
+++ mts/smtp/Makefile.in        8 Nov 2005 13:57:51 -0000
@@ -79,7 +79,7 @@
 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)
Index: mts/smtp/smtp.c
===================================================================
RCS file: /cvsroot/nmh/nmh/mts/smtp/smtp.c,v
retrieving revision 1.17
diff -u -r1.17 smtp.c
--- mts/smtp/smtp.c     18 May 2005 13:24:14 -0000      1.17
+++ mts/smtp/smtp.c     8 Nov 2005 13:57:51 -0000
@@ -959,7 +959,7 @@
     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)
Index: sbr/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/sbr/Makefile.in,v
retrieving revision 1.18
diff -u -r1.18 Makefile.in
--- sbr/Makefile.in     6 Nov 2005 00:28:12 -0000       1.18
+++ sbr/Makefile.in     8 Nov 2005 13:57:51 -0000
@@ -131,7 +131,7 @@
        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 @@
 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)
Index: uip/Makefile.in
===================================================================
RCS file: /cvsroot/nmh/nmh/uip/Makefile.in,v
retrieving revision 1.18
diff -u -r1.18 Makefile.in
--- uip/Makefile.in     16 Sep 2003 14:27:55 -0000      1.18
+++ uip/Makefile.in     8 Nov 2005 13:57:51 -0000
@@ -327,7 +327,7 @@
 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)


This e-mail and any attachment is for authorised use by the intended 
recipient(s) only. It may contain proprietary material, confidential 
information and/or be subject to legal privilege. It should not be copied, 
disclosed to, retained or used by, any other party. If you are not an intended 
recipient then please promptly delete this e-mail and any attachment and all 
copies and inform the sender. Thank you.


_______________________________________________
Nmh-workers mailing list
Nmh-workers@nongnu.org
http://lists.nongnu.org/mailman/listinfo/nmh-workers

<Prev in Thread] Current Thread [Next in Thread>