Build our libopts by default (static, and without installing it

bk: 454eed0d2kw59KegUPD9bNEv5weKXA

diff --git a/configure.ac b/configure.ac
index 2beb0a526bbf3034a5182a9d4a57f94ef3d884d2..75244c010d011476406caba1295d753261fbe919 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,19 @@ esac
 
 AMU_OS_CFLAGS
 
+# NTP has (so far) been relying on leading-edge autogen.
+# Therefore, by default:
+# - use the version we ship with
+# - do not install it
+# - build a static copy (AC_DISABLE_SHARED - done earlier)
+case "${enable_local_libopts+set}" in
+ set) ;;
+ *) enable_local_libopts=yes ;;
+esac
+case "${enable_libopts_install+set}" in
+ set) ;;
+ *) enable_libopts_install=no ;;
+esac
 LIBOPTS_CHECK(libopts)
 
 AC_MSG_CHECKING([[if $CC can handle #warning]])
@@ -282,6 +295,10 @@ case "$host" in
  alpha-dec-osf4.0)
     AC_DISABLE_SHARED
     ;;
+ *) # So far, the only shared library we might use is libopts.
+    # It's a small library - we might as well use a static version of it.
+    AC_DISABLE_SHARED
+    ;;
 esac
 
 AC_PROG_LIBTOOL

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 718fbef19862b1eae5f2fd1e21505749d1f5d1e4..5cc52b12db910944931c689b4b1d5963ec897669 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -7,8 +7,26 @@ AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
 AC_PROG_CC
+
+# So far, the only shared library we might use is libopts.
+# It's a small library - we might as well use a static version of it.
+AC_DISABLE_SHARED
+
 AC_PROG_LIBTOOL
 
+# NTP has (so far) been relying on leading-edge autogen.
+# Therefore, by default:
+# - use the version we ship with
+# - do not install it
+# - build a static copy (AC_DISABLE_SHARED - done earlier)
+case "${enable_local_libopts+set}" in
+ set) ;;
+ *) enable_local_libopts=yes ;;
+esac
+case "${enable_libopts_install+set}" in
+ set) ;;
+ *) enable_libopts_install=no ;;
+esac
 LIBOPTS_CHECK
 
 AC_MSG_CHECKING([[if $CC can handle #warning]])