Auto* cleanup.

bk: 3ca037f9ynux35tzvFRMVO0VTvYd-w

diff --git a/configure.in b/configure.in
index 0bbfec1347f2ed99a59c2c7e094a457810a5bd7f..538f568e6a5a3d242b159ff1381570d6e17b3b85 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -241,7 +241,7 @@ AC_EGREP_CPP(yes,
 #ifdef PPS_API_VERS_1
 yes
 #endif
-], AC_CHECK_HEADERS(sys/timepps.h))
+], [AC_CHECK_HEADERS(sys/timepps.h)])
 AC_CHECK_HEADERS(sys/timers.h sys/timex.h sys/tpro.h sys/types.h sys/wait.h)
 AC_HEADER_TIME
 case "$target" in
@@ -2441,6 +2441,8 @@ case "$ans" in
     esac
     ;;
 esac
+AM_CONDITIONAL(isRSAREF, test x$RSADIR = xrsaref2)
+AM_CONDITIONAL(isRSAEURO, test x$RSADIR = xrsaeuro1)
 AC_SUBST(AUTOKEY)
 case "$ans" in
  no) ;;
@@ -3243,10 +3245,10 @@ esac
 
 AC_DEFINE_DIR(NTP_KEYSDIR, sysconfdir, [Default location of crypto key info])
 
-# This *was* necessary so that .o files in LIBOBJS are also built via
-# the ANSI2KNR-filtering rules.
-# Autoconf 2.52 doesn't need it, and 2.53 hates it.
-#LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
+# HMS: I think we avoid this problem now...
+## This is necessary so that .o files in LIBOBJS are also built via
+## the ANSI2KNR-filtering rules.
+#LIB@&t@OBJS=`echo "$LIB@&t@OBJS" | sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
 
 AC_CONFIG_FILES(Makefile adjtimed/Makefile clockstuff/Makefile \
 ElectricFence/Makefile

diff --git a/libntp/Makefile.am b/libntp/Makefile.am
index 56448af5062e690f7c9911b691304e154ab3ad33..bf3dc996c2daa006da5a27ce35367d689bad71a8 100644 (file)
--- a/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@ -2,21 +2,18 @@
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = libntp.a
 libntp_a_SOURCES = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
-       authencrypt.c authkeys.c authparity.c authreadkeys.c authusekey.c \
-       buftvtots.c caljulian.c calleapwhen.c caltontp.c calyearstart.c \
-       clocktime.c clocktypes.c decodenetnum.c dofptoa.c dolfptoa.c \
-       emalloc.c findconfig.c fptoa.c fptoms.c getopt.c hextoint.c \
-       hextolfp.c humandate.c inttoa.c lib_strbuf.c machines.c md5c.c \
-       memmove.c mfptoa.c mfptoms.c modetoa.c mstolfp.c msutotsf.c \
+       audio.c authencrypt.c authkeys.c authparity.c authreadkeys.c \
+       authusekey.c binio.c buftvtots.c caljulian.c calleapwhen.c caltontp.c \
+       calyearstart.c clocktime.c clocktypes.c decodenetnum.c dofptoa.c \
+       dolfptoa.c emalloc.c findconfig.c fptoa.c fptoms.c getopt.c \
+       gpstolfp.c hextoint.c hextolfp.c humandate.c icom.c ieee754io.c \
+       inttoa.c iosignal.c lib_strbuf.c machines.c md5c.c memmove.c \
+       mfp_mul.c mfptoa.c mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c \
        msyslog.c netof.c numtoa.c numtohost.c octtoint.c prettydate.c \
-       ranny.c refnumtoa.c statestr.c syssignal.c systime.c tsftomsu.c \
-       tstotv.c tvtoa.c tvtots.c uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
-       mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c \
-       icom.c audio.c
+       ranny.c recvbuff.c refnumtoa.c snprintf.c statestr.c strdup.c \
+       strerror.c syssignal.c systime.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
+       uglydate.c uinttoa.c utvtoa.c ymd2yd.c
 EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
-#      mktime.c snprintf.c strdup.c strerror.c
-libntp_a_LIBADD = @LIBOBJS@
-libntp_a_DEPENDENCIES = @LIBOBJS@
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 ETAGS_ARGS = Makefile.am
 

diff --git a/libntp/mktime.c b/libntp/mktime.c
index b9cd42e7203e6d3c304a08e16479ba1fcfbb72b0..6d944f957793cd3288c1bcfee2db5f2f307348b5 100644 (file)
--- a/libntp/mktime.c
+++ b/libntp/mktime.c
@@ -62,6 +62,8 @@
 
 #include "ntp_machine.h"
 
+#if !HAVE_MKTIME
+
 #ifndef DSTMINUTES
 #define DSTMINUTES 60
 #endif
@@ -272,3 +274,6 @@ mktime(
 {
        return time1(tmp);
 }
+#else
+int mktime_bs;
+#endif

diff --git a/libntp/snprintf.c b/libntp/snprintf.c
index d65f6a96a02bfe8e18a47fd156c05df6271f1bd1..101bc1730474fd7d645e4e521143f66408aa263a 100644 (file)
--- a/libntp/snprintf.c
+++ b/libntp/snprintf.c
@@ -1,5 +1,6 @@
 #include <config.h>
 
+#if !HAVE_SNPRINTF
 #include <sys/types.h>
 
 #ifdef __STDC__
@@ -53,3 +54,6 @@ vsnprintf(str, n, fmt, ap)
        return (vsprintf(str, fmt, ap));
 #endif
 }
+#else
+int snprintf_bs;
+#endif

diff --git a/libntp/strdup.c b/libntp/strdup.c
index 32ca7f7cdddc68254b98316f3f59510719f6ba73..2e26ba7a51e40cb2c930e694b3fe33bfa7cedef7 100644 (file)
--- a/libntp/strdup.c
+++ b/libntp/strdup.c
@@ -1,4 +1,7 @@
 #include "ntp_malloc.h"
+
+#if !HAVE_STRDUP
+
 #define NULL 0
 
 char *strdup(const char *s);
@@ -20,3 +23,6 @@ strdup(
        }
         return(cp);
 }
+#else
+int strdup_bs;
+#endif

diff --git a/libntp/strerror.c b/libntp/strerror.c
index a07bcd65427b14c9d9ef59b887a76133004949e2..5a9595a9a6e8d55f79f79924911d94849a828413 100644 (file)
--- a/libntp/strerror.c
+++ b/libntp/strerror.c
@@ -1,3 +1,6 @@
+#include <config.h>
+
+#if !HAVE_STRERROR
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -38,3 +41,6 @@ strerror(
        (void)sprintf(ebuf, "Unknown error: %d", errnum);
        return(ebuf);
 }
+#else
+int strerror_bs;
+#endif

diff --git a/librsaref/Makefile.am b/librsaref/Makefile.am
index 889251ebcb1878b57078369061edea40f30db3e2..f745088da9258f9160bc861b794da98060eda8ab 100644 (file)
--- a/librsaref/Makefile.am
+++ b/librsaref/Makefile.am
@@ -7,6 +7,9 @@ CLEANFILES = $(EXTRA_LIBRARIES)
 # NOTES:
 # don't use RSAREF's global.h - we use ours.
 
+@isRSAREF_TRUE@foo = digit.c digit.h
+@isRSAEURO_TRUE@foo = md4c.c shsc.c
+
 nodist_librsaref_a_SOURCES = \
        desc.c \
        md2c.c \
@@ -27,7 +30,7 @@ nodist_librsaref_a_SOURCES = \
        prime.h \
        r_random.h \
        rsa.h \
-       rsaref.h @RSASRCS@
+       rsaref.h $(foo)
 
 librsaref_a_LIBADD = @RSAOBJS@
 librsaref_a_DEPENDENCIES = $(librsaref_a_LIBADD)