From: Dave Hart <hart@ntp.org>
Date: Fri, 17 Dec 2010 01:46:51 +0000 (+0000)
Subject: restore NTP local patch to LIBOPTS_CHECK to not build libopts
X-Git-Tag: NTP_4_2_7P95~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fe1b4918aeaf7fa3848166bdc76df027d5efc4a;p=thirdparty%2Fntp.git

restore NTP local patch to LIBOPTS_CHECK to not build libopts
  from the top-level configure.ac.

bk: 4d0ac10bdt0Lf1Ns036YEkGkgmN6Tg
---

diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
index 7841cf4e7..5da1b1911 100644
--- a/sntp/libopts/m4/libopts.m4
+++ b/sntp/libopts/m4/libopts.m4
@@ -436,7 +436,11 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 
 ]) # end AC_DEFUN of INVOKE_LIBOPTS_MACROS
 
-dnl @synopsis  LIBOPTS_CHECK
+dnl @synopsis  LIBOPTS_CHECK(libopts-path, options)
+dnl
+dnl libopts-path defaults to [libopts] if not provided.
+dnl Only one option is supported, [skip-makefile], which
+dnl conditionalizes away the AC_CONFIG_FILES(libopts-path/Makefile).
 dnl
 dnl Time-stamp:        "2010-11-29 15:45:54 bkorb"
 dnl
@@ -531,13 +535,12 @@ AC_DEFUN([LIBOPTS_CHECK],[
   AC_SUBST(LIBOPTS_LDADD)
   AC_SUBST(LIBOPTS_CFLAGS)
   AC_SUBST(LIBOPTS_DIR, AO_Libopts_Dir)
-  AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)
+  AM_CONDITIONAL([BUILD_LIBOPTS], [test -n "${NEED_LIBOPTS_DIR}" -a -z "]$2["])
+  AM_COND_IF([BUILD_LIBOPTS],
+    [AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)])
   m4_popdef([AO_Libopts_Dir])
 
-  [if test -n "${NEED_LIBOPTS_DIR}" ; then]
-    INVOKE_LIBOPTS_MACROS
-  else
-    INVOKE_LIBOPTS_MACROS_FIRST
-  [fi
+  AM_COND_IF([BUILD_LIBOPTS], [INVOKE_LIBOPTS_MACROS])
+  [
 # end of AC_DEFUN of LIBOPTS_CHECK]
 ])