remove old binsubdir stuff from SNTP, as NTP_LOCINFO does that now.

bk: 4e311802tSnEoVmAX09sE_MtmY5rrQ

diff --git a/ChangeLog b/ChangeLog
index 062a521d5e5cfa35bb106ae836af006f9edb52d7..fe40c50b4b9628145dec1a4825444aadf0ea9fc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* remove old binsubdir stuff from SNTP, as NTP_LOCINFO does that now.
 (4.2.7p197) 2011/07/28 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1975] from 4.2.6p4-RC2: libntp/mktime.c won't work with 64-bit
   time_t

diff --git a/sntp/configure.ac b/sntp/configure.ac
index edf0d6104082b0c980833a92ba0ce1797aa03ffb..038f657a941fc02c770bfa8c6d5336d22619b75f 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -65,106 +65,6 @@ AC_SUBST([LIBTOOL_DEPS])
 
 NTP_WITHSNTP
 
-# We need to know:
-# - where to install sntp {bin,sbin}
-# - what manual section the sntp page belongs in {1,1m,1M,8}
-# - which style of macros should be used {man.mdoc}
-#
-# When configure is invoked from the main NTP directory, we will have:
-# - SNTP_DB=sntp (if we are installing sntp in bindir, empty otherwise)
-# - SNTP_DL=sntp (if we are installing sntp in libexecdir, empty otherwise)
-# - SNTP_DS=sntp (if we are installing sntp in sbindir, empty otherwise)
-# - SNTP_MS={1,1m,1M,8}
-# - MANTAGFMT={man,mdoc}
-
-AC_MSG_CHECKING([for bin subdirectory])
-AC_ARG_WITH(
-    [binsubdir],
-    [AS_HELP_STRING(
-       [--with-binsubdir],
-       [bin ={bin,libexec,sbin}]
-    )],
-    [use_binsubdir="$withval"],
-    [use_binsubdir="bin"]
-)
-case "$use_binsubdir" in
- bin)
-    SNTP_DB=$SNTP
-    SNTP_DL=
-    SNTP_DS=
-    ;;
- libexec)
-    SNTP_DB=
-    SNTP_DL=$SNTP
-    SNTP_DS=
-    ;;
- sbin)
-    SNTP_DB=
-    SNTP_DL=
-    SNTP_DS=$SNTP
-    ;;
- *)
-    AC_MSG_ERROR([<$use_binsubdir> is illegal - must be "bin" "libexec" or "sbin"])
-    ;;
-esac
-AC_MSG_RESULT([$use_binsubdir])
-
-AC_SUBST([SNTP_DB])
-AC_SUBST([SNTP_DL])
-AC_SUBST([SNTP_DS])
-
-AC_MSG_CHECKING([for manual page installation section])
-AC_ARG_WITH(
-    [mansec],
-    [AS_HELP_STRING(
-       [--with-mansec],
-       [1 ={1,1m,1M,8}]
-    )],
-    [use_mansec="$withval"],
-    [use_mansec="1"]
-)
-case "$use_mansec" in
- 1)
-    ;;
- 1m)
-    ;;
- 1M)
-    ;;
- 8)
-    ;;
- *)
-    AC_MSG_ERROR([<$use_mansec> is illegal - must be "1" or "1m" or "1M" or "8"])
-    ;;
-esac
-SNTP_MS=$use_mansec
-AC_MSG_RESULT([$use_mansec])
-
-AC_SUBST([SNTP_MS])
-
-AC_MSG_CHECKING([for manual page formatting macros])
-AC_ARG_WITH(
-    [mantagfmt],
-    [AS_HELP_STRING(
-       [--with-mantagfmt],
-       [man ={man,mdoc}]
-    )],
-    [use_mantagfmt="$withval"],
-    [use_mantagfmt="man"]
-)
-case "$use_mantagfmt" in
- man)
-    ;;
- mdoc)
-    ;;
- *)
-    AC_MSG_ERROR([<$use_mantagfmt> is illegal - must be "man" or "mdoc"])
-    ;;
-esac
-MANTAGFMT=$use_mantagfmt
-AC_MSG_RESULT([$use_mantagfmt])
-
-AC_SUBST([MANTAGFMT])
-
 ###
 
 # NTP has (so far) been relying on leading-edge autogen.