* bootstrap.sh: Don't assume that libgetopt++ exists in source directory.

* configure.in: Remove some old options.
* Makefile.am: Ditto.
* libgetopt++/Makefile.am: Ditto.
* libgetopt++/configure.in: Ditto.

diff --git a/ChangeLog b/ChangeLog
index 78d3a8c2525749b41525a367833ff9b28063b1a8..d4404ed3ab5d31553421e9439c8d85138d26fb4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-24  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+       * bootstrap.sh: Don't assume that libgetopt++ exists in source directory.
+       * configure.in: Remove some old options.
+       * Makefile.am: Ditto.
+       * libgetopt++/Makefile.am: Ditto.
+       * libgetopt++/configure.in: Ditto.
+
 2012-02-24  Corinna Vinschen  <corinna@vinschen.de>
 
        * main.cc (WinMain): Move call to nt_sec.setDefaultSecurity here so

diff --git a/bootstrap.sh b/bootstrap.sh
index f444fc0c1d6277ac1be7fbd3ad485e17af171897..8d2c09d8551579a9e1b53548325d0b0fc9d52650 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -40,7 +40,7 @@ bootstrap automake --foreign --add-missing
 
 # Run bootstrap in required subdirs, iff it has not yet been run
 echo "bootstrapping in $srcdir/libgetopt++"
-cd libgetopt++; ./bootstrap.sh
+cd libgetopt++ && ./bootstrap.sh
 
 if test -n "$NOCONFIGURE"; then
        echo "Skipping configure per request"

diff --git a/configure.ac b/configure.ac
index eef28b8f825ade2851dc1fb9a5fd926845804788..bbcadff1550a83a9cf2195aff0a42d7c22895926 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([setup], [0], [cygwin-apps@cygwin.com])
 AC_PREREQ(2.60)
 AC_CONFIG_AUX_DIR([cfgaux])
-AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.9 foreign no-define -Wall -Wno-portability])
+AM_INIT_AUTOMAKE([subdir-objects foreign no-define -Wall -Wno-portability])
 dnl AM_CONFIG_HEADER(include/autoconf.h)
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([Makefile.in])

diff --git a/configure.in b/configure.in
index eef28b8f825ade2851dc1fb9a5fd926845804788..bbcadff1550a83a9cf2195aff0a42d7c22895926 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([setup], [0], [cygwin-apps@cygwin.com])
 AC_PREREQ(2.60)
 AC_CONFIG_AUX_DIR([cfgaux])
-AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.9 foreign no-define -Wall -Wno-portability])
+AM_INIT_AUTOMAKE([subdir-objects foreign no-define -Wall -Wno-portability])
 dnl AM_CONFIG_HEADER(include/autoconf.h)
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([Makefile.in])

diff --git a/libgetopt++/Makefile.am b/libgetopt++/Makefile.am
index 3da877d841d8b0d4d7fef8ba879cb1dd8f57dd40..fbb9298d33348c0ad0123539ecf8c3b165f90903 100644 (file)
--- a/libgetopt++/Makefile.am
+++ b/libgetopt++/Makefile.am
@@ -3,7 +3,7 @@
 # $Id$
 #
 
-AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
+AUTOMAKE_OPTIONS = subdir-objects 1.9 foreign
 # -Wno-uninitialized added to deal with g++ 3.4.4's spurious STL warnings
 # (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22207)
 AM_CXXFLAGS = -Wall -Werror -Wno-uninitialized

diff --git a/libgetopt++/configure.ac b/libgetopt++/configure.ac
index 7479a292a29a276cbef3fb6f1ef926bd0f231c01..bff7ca6a9ef1338b2d37f391162abe31415b3571 100644 (file)
--- a/libgetopt++/configure.ac
+++ b/libgetopt++/configure.ac
@@ -8,7 +8,7 @@ dnl
 dnl
 dnl
 AC_INIT(src/GetOption.cc)
-AC_PREREQ(2.52)
+AC_PREREQ(2.60)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(GetOpt++, 0.0.2-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)

diff --git a/libgetopt++/configure.in b/libgetopt++/configure.in
index 7479a292a29a276cbef3fb6f1ef926bd0f231c01..bff7ca6a9ef1338b2d37f391162abe31415b3571 100644 (file)
--- a/libgetopt++/configure.in
+++ b/libgetopt++/configure.in
@@ -8,7 +8,7 @@ dnl
 dnl
 dnl
 AC_INIT(src/GetOption.cc)
-AC_PREREQ(2.52)
+AC_PREREQ(2.60)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(GetOpt++, 0.0.2-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)