From 4a8be6e0d505f90b938714d13eeecaaaa1a601d4 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 24 Feb 2012 20:21:43 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ bootstrap.sh | 2 +- configure.ac | 2 +- configure.in | 2 +- libgetopt++/Makefile.am | 2 +- libgetopt++/configure.ac | 2 +- libgetopt++/configure.in | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78d3a8c2..d4404ed3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-02-24 Christopher Faylor + + * 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 * main.cc (WinMain): Move call to nt_sec.setDefaultSecurity here so diff --git a/bootstrap.sh b/bootstrap.sh index f444fc0c..8d2c09d8 100755 --- 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 eef28b8f..bbcadff1 100644 --- 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 eef28b8f..bbcadff1 100644 --- 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 3da877d8..fbb9298d 100644 --- 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 7479a292..bff7ca6a 100644 --- 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 7479a292..bff7ca6a 100644 --- 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) -- 2.43.5