From: Dave Hart <hart@ntp.org>
Date: Sun, 1 May 2011 21:15:54 +0000 (+0000)
Subject: [Bug 1906] 4.2.7p160 - libtool: compile: cannot determine name of
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efbf8ca0c051740bb885878911b11f968f96bfc3;p=thirdparty%2Fntp.git

[Bug 1906] 4.2.7p160 - libtool: compile: cannot determine name of
  library object in ./libevent
Share a single sntp/libevent/build-aux directory between all three
  configure scripts.

bk: 4dbdcd8aBafntXAHTTQJPgzz-g6syA
---

diff --git a/ChangeLog b/ChangeLog
index 3552487ef9..62c467e854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 * [Bug 1904] 4.2.7p160 Windows build broken (POSIX_SHELL).
+* [Bug 1906] 4.2.7p160 - libtool: compile: cannot determine name of
+  library object in ./libevent
+* Share a single sntp/libevent/build-aux directory between all three
+  configure scripts.
 (4.2.7p160) 2011/05/01 Released by Harlan Stenn <stenn@ntp.org>
 * from 4.2.6p4-RC1: Upgrade to libopts 35.0.10 from AutoGen 5.11.9pre8.
 * [Bug 1901] Simulator does not set progname.
diff --git a/Makefile.am b/Makefile.am
index e90e7a46b7..664ae06574 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,7 @@ libtool: $(LIBTOOL_DEPS)
 
 # HMS: The following seems to be a work-in-progress...
 
-CVO=`$(srcdir)/sntp/build-aux/config.guess`
+CVO=`$(srcdir)/sntp/libevent/build-aux/config.guess`
 
 .buildcvo:
 	echo "$(CVO)" > .buildcvo
diff --git a/build b/build
index fb9095a83d..8bb65e5b8d 100755
--- a/build
+++ b/build
@@ -30,7 +30,7 @@ esac
 #set -e
 #set -x
 
-if [ ! -r sntp/build-aux/config.guess ] ; then
+if [ ! -r sntp/libevent/build-aux/config.guess ] ; then
 	echo "Error: bootstrap required." 1>&2 && exit 1
 fi
 
@@ -38,7 +38,7 @@ fi
 # in the build-aux directory if there's not another config.guess earlier
 # on the path, so we invoke it using env to append to the PATH.
 
-CVO=`env PATH="$PATH:./sntp/build-aux" scripts/cvo.sh @cvo@`
+CVO=`env PATH="$PATH:./sntp/libevent/build-aux" scripts/cvo.sh @cvo@`
 case "$CVO" in
  *-*-*-*) echo "scripts/cvo.sh returned <$CVO>, which makes no sense to me."
     exit 1
diff --git a/configure.ac b/configure.ac
index 49fa718812..5dadabcab3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_INIT(
     [http://www.ntp.org./]dnl
 )
 AC_CONFIG_MACRO_DIR([sntp/m4])
-AC_CONFIG_AUX_DIR([sntp/build-aux])
+AC_CONFIG_AUX_DIR([sntp/libevent/build-aux])
 
 AC_PRESERVE_HELP_ORDER
 
diff --git a/flock-build b/flock-build
index 69f7ffe807..b537ac3491 100755
--- a/flock-build
+++ b/flock-build
@@ -52,7 +52,7 @@ esac
 # * pogo	   sparc-sun-solaris2.10
 # * rackety	   freebsd-6.1
 
-if [ ! -r sntp/build-aux/config.guess ] ; then
+if [ ! -r sntp/libevent/build-aux/config.guess ] ; then
 	echo "Error: bootstrap required." 1>&2 && exit 1
 fi
 
diff --git a/sntp/configure.ac b/sntp/configure.ac
index 316926b0e4..18a0fda4ca 100644
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -10,7 +10,7 @@ AC_INIT(
     [http://www.ntp.org./]dnl
 )
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_AUX_DIR([libevent/build-aux])
 
 # Bump sntp_configure_cache_version for each change to configure.ac or
 # .m4 files which invalidates cached values from previous configure 
diff --git a/sntp/libevent/configure.in b/sntp/libevent/configure.in
index d8ccf4e987..226e9b6e30 100644
--- a/sntp/libevent/configure.in
+++ b/sntp/libevent/configure.in
@@ -4,6 +4,7 @@ AC_PREREQ(2.59)
 AC_INIT(event.c)
 
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
 
 AM_INIT_AUTOMAKE(libevent,2.1.0-alpha-dev)
 dnl AM_SILENT_RULES req. automake 1.11.  [no] defaults V=1