From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 6 Nov 2006 08:06:37 +0000 (-0500)
Subject: Build our libopts by default (static, and without installing it
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6c1304d01cd30f44406f608f79559ef09740ad5;p=thirdparty%2Fntp.git

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

bk: 454eed0d2kw59KegUPD9bNEv5weKXA
---

diff --git a/configure.ac b/configure.ac
index 2beb0a526b..75244c010d 100644
--- 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 718fbef198..5cc52b12db 100644
--- 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]])