* itk/Makefile.in (distclean): Remove pkgIndex.tcl and

        itkConfig.sh
        * itcl/Makefile.in (distclean): Remove pkgIndex.tcl and
        itclConfig.sh
        * iwidgets3.0.0/Makefile.in (distclean): Remove pkgIndex.tcl and
        iwidgets.tcl.
        * configure.in (subdirs): New variable. Don't put AC_CONFIG_SUBDIRS
        macro into configure.in twice: it confuses autoconf. Instead use
        the variable to hold the subdirs to be configured.
        * configure: Regenerated.

diff --git a/itcl/ChangeLog b/itcl/ChangeLog
index 0712266..8a01885 100644 (file)
--- a/itcl/ChangeLog
+++ b/itcl/ChangeLog
@@ -1,3 +1,16 @@
+2002-09-05  Keith Seitz  <keiths@redhat.com>
+
+       * itk/Makefile.in (distclean): Remove pkgIndex.tcl and
+       itkConfig.sh
+       * itcl/Makefile.in (distclean): Remove pkgIndex.tcl and
+       itclConfig.sh
+       * iwidgets3.0.0/Makefile.in (distclean): Remove pkgIndex.tcl and
+       iwidgets.tcl.
+       * configure.in (subdirs): New variable. Don't put AC_CONFIG_SUBDIRS
+       macro into configure.in twice: it confuses autoconf. Instead use
+       the variable to hold the subdirs to be configured.
+       * configure: Regenerated.
+
 2002-09-04 Keith Seitz  <keiths@redhat.com> 
 
        From Chris Drexler  <ckolumbus@users.sourceforge.net>:

diff --git a/itcl/configure b/itcl/configure
index 8a3dc5f..742a924 100755 (executable)
--- a/itcl/configure
+++ b/itcl/configure
@@ -681,13 +681,15 @@ fi
 
 
 # Source-Navigator does not use the iwidgets packag
+subdirs=
+
 if test -d ${srcdir}/../snavigator && test ! -d ${srcdir}/../gdb/gdbtk ; then
     subdirs="itcl itk"
-
 else
-    subdirs="itcl itk itcl itk iwidgets3.0.0"
-
+    subdirs="itcl itk iwidgets3.0.0"
 fi
+subdirs="$subdirs"
+
 
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -973,7 +975,7 @@ if test "$no_recursion" != yes; then
     esac
   done
 
-  for ac_config_dir in itcl itk itcl itk iwidgets3.0.0; do
+  for ac_config_dir in $subdirs; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.

diff --git a/itcl/configure.in b/itcl/configure.in
index e468ada..ec53b3b 100644 (file)
--- a/itcl/configure.in
+++ b/itcl/configure.in
@@ -25,11 +25,14 @@ AC_PREFIX_DEFAULT(/usr/local)
 AC_PREFIX_PROGRAM(itclsh)
 
 # Source-Navigator does not use the iwidgets packag
+subdirs=
+
 if test -d ${srcdir}/../snavigator && test ! -d ${srcdir}/../gdb/gdbtk ; then
-    AC_CONFIG_SUBDIRS(itcl itk)
+    subdirs="itcl itk"
 else
-    AC_CONFIG_SUBDIRS(itcl itk iwidgets3.0.0)
+    subdirs="itcl itk iwidgets3.0.0"
 fi
+AC_CONFIG_SUBDIRS($subdirs)
 
 AC_OUTPUT(Makefile,
        chmod +x ${srcdir}/config/install-sh ${srcdir}/config/mkinstalldirs)

diff --git a/itcl/itcl/Makefile.in b/itcl/itcl/Makefile.in
index 1fb42d9..060e096 100644 (file)
--- a/itcl/itcl/Makefile.in
+++ b/itcl/itcl/Makefile.in
@@ -407,7 +407,7 @@ distclean: clean
        -rm -f *.tab.c
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       -rm -f config.status
+       -rm -f config.status itclConfig.sh pkgIndex.tcl
 
 #========================================================================
 # Install binary object libraries.  On Windows this includes both .dll and

diff --git a/itcl/itk/Makefile.in b/itcl/itk/Makefile.in
index 4a5e8bb..c69f4f4 100644 (file)
--- a/itcl/itk/Makefile.in
+++ b/itcl/itk/Makefile.in
@@ -381,7 +381,7 @@ distclean: clean
        -rm -f *.tab.c
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-       -rm -f config.status
+       -rm -f config.status itkConfig.sh pkgIndex.tcl
 
 #========================================================================
 # Install binary object libraries.  On Windows this includes both .dll and

diff --git a/itcl/iwidgets3.0.0/Makefile.in b/itcl/iwidgets3.0.0/Makefile.in
index 396195d..b1889d2 100644 (file)
--- a/itcl/iwidgets3.0.0/Makefile.in
+++ b/itcl/iwidgets3.0.0/Makefile.in
@@ -226,6 +226,7 @@ clean:
 
 distclean: clean
        rm -f Makefile config.status config.cache config.log
+       rm -f iwidgets.tcl pkgIndex.tcl
 
 depend:
        makedepend -- $(CC_SWITCHES) -- $(SRCS)