cleanup

bk: 41dc605eyPos2LnbBAJt5IyS6Xax8A

diff --git a/configure.ac b/configure.ac
index 67ee28ff9cc8858f79f244dfa3b95fcd1847465c..33e849410fd8a47cdf3030258aec22d418636211 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,41 @@ esac
 AMU_OS_CFLAGS
 LIBOPTS_CHECK
 
+AC_MSG_CHECKING(for bin subdirectory)
+AC_ARG_WITH(binsubdir,
+       AC_HELP_STRING([--with-binsubdir], [bin ={bin,sbin}]),
+       use_binsubdir="$withval", use_binsubdir="bin")
+
+case "$use_binsubdir" in
+ bin)
+    ;;
+ sbin)
+    ;;
+ *)
+    AC_MSG_ERROR([<$use_binsubdir> is illegal - must be "bin" or "sbin"])
+    ;;
+esac
+AC_MSG_RESULT($use_binsubdir)
+BINSUBDIR=$use_binsubdir
+AC_SUBST(BINSUBDIR)
+
+AC_MSG_CHECKING(if we want to use arlib)
+AC_ARG_WITH(arlib,
+       AC_HELP_STRING([--with-arlib], [- Compile the async resolver library?]),
+       [ans=$withval], [ans=no])
+AC_MSG_RESULT($ans)
+
+if test -d $srcdir/arlib
+then
+    case "$ans" in
+     yes)
+       ARLIB_DIR=arlib
+       AC_CONFIG_SUBDIRS(arlib)
+       ;;
+    esac
+fi
+AC_SUBST(ARLIB_DIR)
+
 AC_ARG_WITH(rpath,
        AC_HELP_STRING([--without-rpath], [s Disable auto-added -R linker paths]),
 [ans=$withval], [ans=x])
@@ -474,6 +509,15 @@ AC_TYPE_SIGNAL
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 AC_CHECK_TYPE(time_t, long)
+AC_CHECK_TYPES(uintptr_t)
+ 
+AH_VERBATIM([TYPEDEF_UINTPTR_T],
+[/* Provide a typedef for uintptr_t? */
+#ifndef HAVE_UINTPTR_T
+typedef unsigned int   uintptr_t;
+#define HAVE_UINTPTR_T 1
+#endif])
+
 AC_STRUCT_TM
 
 AC_CACHE_CHECK([for u_int8_t], ac_cv_type_u_int8_t,
@@ -3922,39 +3966,6 @@ found_rt_iflist
 
 AC_DEFINE_DIR(NTP_KEYSDIR, sysconfdir, [Default location of crypto key info])
 
-AC_SUBST(ARLIB_DIR)
-if test -d $srcdir/arlib
-then
-    AC_ARG_WITH(arlib,
-       AC_HELP_STRING([--with-arlib], [- Compile the async resolver library?]),
-    [ans=$withval], [ans=no])
-
-    case "$ans" in
-     yes)
-       ARLIB_DIR=arlib
-       AC_CONFIG_SUBDIRS(arlib)
-       ;;
-    esac
-fi
-
-AC_MSG_CHECKING(for bin subdirectory)
-AC_ARG_WITH(binsubdir,
-       AC_HELP_STRING([--with-binsubdir], [bin ={bin,sbin}]),
-       use_binsubdir="$withval", use_binsubdir="bin")
-
-case "$use_binsubdir" in
- bin)
-    ;;
- sbin)
-    ;;
- *)
-    AC_MSG_ERROR([<$use_binsubdir> is illegal - must be "bin" or "sbin"])
-    ;;
-esac
-AC_MSG_RESULT($use_binsubdir)
-BINSUBDIR=$use_binsubdir
-AC_SUBST(BINSUBDIR)
-
 AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(ElectricFence/Makefile)
 AC_CONFIG_FILES(adjtimed/Makefile)

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 457d07adbb4d208aaf9ecb23f9016361f97910e8..3815b5a05561650faa821b89b823e5cf17bacd1d 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS=   ntpq
 AM_CPPFLAGS=   -I$(top_srcdir)/include $(LIBOPTS_CFLAGS)
 
 # LDADD might need RESLIB and ADJLIB
-ntpq_LDADD=    version.o ../libntp/libntp.a @READLINE_LIBS@ $(LIBOPTS_LDADD)
+ntpq_LDADD=    version.o @READLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
 DISTCLEANFILES=        .version version.c
 noinst_HEADERS=        ntpq.h
 ETAGS_ARGS=    Makefile.am