From 5683b590ce9ddcf83c8d6e584e2ee085ff4705f2 Mon Sep 17 00:00:00 2001
From: mes5k <mes5k>
Date: Mon, 26 Apr 2004 15:18:08 +0000
Subject: [PATCH] fixed for autotools for mandrake

---
 Makefile.am          |  1 -
 autotools.sh         | 21 +++++++++++++++++----
 examples/Makefile.am |  2 +-
 src/Makefile.am      |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 44aba66..f9ef5ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
 
 SUBDIRS = src include examples docs tests
 
-CXXFLAGS = -Wall
diff --git a/autotools.sh b/autotools.sh
index 78ae964..9b2f08f 100755
--- a/autotools.sh
+++ b/autotools.sh
@@ -1,6 +1,19 @@
 #!/bin/bash
 
-aclocal -I config  
-autoconf
-autoheader
-automake -a
+echo "Using autotools versions:"	
+if [[ -e autoconf-2.5x && -e automake-1.7 ]]
+then
+	autoconf-2.5x --version | grep autoconf
+	automake-1.7 --version | grep automake
+	aclocal-1.7 -I config  
+	autoconf-2.5x
+	autoheader-2.5x
+	automake-1.7 -a
+else
+	autoconf --version | grep autoconf
+	automake --version | grep automake
+	aclocal -I config  
+	autoconf
+	autoheader
+	automake -a
+fi
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e3cf7a2..d0225d0 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -15,4 +15,4 @@ test5_LDADD = $(top_builddir)/src/libtclap.a
 
 INCLUDES = -I$(top_builddir)/include
 
-CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall
diff --git a/src/Makefile.am b/src/Makefile.am
index a7a64a5..80e7e0f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,4 +5,4 @@ libtclap_a_SOURCES = Arg.cpp CmdLine.cpp SwitchArg.cpp XorHandler.cpp
 
 INCLUDES = -I$(top_srcdir)/include
 
-CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall