From eb3b02a6d75ffb5d082203b6bea5f8ef50d7cdff Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Fri, 17 Sep 2010 19:18:26 +0000
Subject: [PATCH] undo "use a subdirectory `config' for autoconfigure ..." from
 today

---
 .cvsignore        |  9 +++++++++
 ChangeLog         |  8 ++++++++
 Makefile.am       | 10 +++++-----
 config/.cvsignore |  7 -------
 configure.ac      |  2 --
 5 files changed, 22 insertions(+), 14 deletions(-)
 delete mode 100644 config/.cvsignore

diff --git a/.cvsignore b/.cvsignore
index 8a8ee611e..ff4446d4a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,12 @@
+config.guess
+config.sub
+ltconfig
+ltmain.sh
 aclocal.m4
+install-sh
 config.h.in
+mkinstalldirs
+missing
 stamp-h*
 Makefile.in
 configure
@@ -10,6 +17,8 @@ libtool
 config.status
 Makefile
 *.cache
+depcomp
+ylwrap
 *.tar.gz
 make.log
 distrib
diff --git a/ChangeLog b/ChangeLog
index 0abed0722..425b0f4df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-17  Robert Larice
+ * .cvsignore ,
+ * Makefile.am ,
+ * configure.ac ,
+ * config/.cvsignore :
+    undo "use a subdirectory `config' for autoconfigure ..." from today
+    this has broken `configure' for xgraph
+
 2010-09-17  Robert Larice
  * src/frontend/Makefile.am :
     fix parse-bison.y dependencies
diff --git a/Makefile.am b/Makefile.am
index af859f3a1..276c25389 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,11 +10,11 @@ EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes  \
 		doc examples visualc @NOTXGRAPH@ \
 		xgraph/aclocal.m4
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config/config.guess \
-			config.h.in config/config.sub configure config/install-sh \
-			config/missing mkinstalldirs stamp-h.in ltconfig \
-			config/ltmain.sh autom4te.cache \
-			config/depcomp config/ylwrap
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
+			config.h.in config.sub configure install-sh \
+			missing mkinstalldirs stamp-h.in ltconfig \
+			ltmain.sh autom4te.cache \
+			depcomp ylwrap
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/config/.cvsignore b/config/.cvsignore
deleted file mode 100644
index aebd95012..000000000
--- a/config/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-config.guess
-config.sub
-depcomp
-install-sh
-ltmain.sh
-missing
-ylwrap
diff --git a/configure.ac b/configure.ac
index 7c559679b..e0cf5b582 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,6 @@ dnl Older versions may not work with this script and this will report the
 dnl problem to the user.  (2.52 is a guess and might need some adjustment)
 AC_PREREQ(2.59)
 
-AC_CONFIG_AUX_DIR(config)
-
 dnl Revison stamp the generated ./configure script
 AC_REVISION($Revision$)