Removed some old crap in it. Removed.

2000-07-24  Martin Baulig  <martin@home-of-linux.org>

	* autogen.sh: Removed some old crap in it.
	* aclocal-include.m4: Removed.

svn path=/trunk/; revision=1320

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 4d96d5d..d6ed307 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,4 +1,7 @@
-2000-07-24  Martin Baulig  <baulig@suse.de>
+2000-07-24  Martin Baulig  <martin@home-of-linux.org>
+
+       * autogen.sh: Removed some old crap in it.
+       * aclocal-include.m4: Removed.
 
        * gnome-x-checks.m4: Check for GTK+ 2.0.
 

diff --git a/macros2/Makefile.am b/macros2/Makefile.am
index 2b190c4..d5f625d 100644 (file)
--- a/macros2/Makefile.am
+++ b/macros2/Makefile.am
@@ -5,7 +5,7 @@ GNOME2_MACROS=                                  \
        gnome-fileutils.m4 gnome-gettext.m4 gnome-gnorba-check.m4 \
        gnome-pthread-check.m4 gnome-support.m4 \
        gnome-x-checks.m4 gnome.m4 linger.m4 need-declaration.m4 \
-       aclocal-include.m4 check-utmp.m4
+       check-utmp.m4
 
 EXTRA_DIST=$(GNOME2_MACROS) autogen.sh
 MAINTAINERCLEANFILES=macros2.dep

diff --git a/macros2/aclocal-include.m4 b/macros2/aclocal-include.m4
deleted file mode 100644 (file)
index abf6533..0000000
--- a/macros2/aclocal-include.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-# aclocal-include.m4
-# 
-# This macro adds the name macrodir to the set of directories
-# that `aclocal' searches for macros.  
-
-# serial 1
-
-dnl AM_ACLOCAL_INCLUDE(macrodir)
-AC_DEFUN([AM_ACLOCAL_INCLUDE],
-[
-       AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y)
-
-       test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-       for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done
-])

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index 7001ca6..b79740b 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -94,32 +94,9 @@ do
     echo skipping $dr -- flagged as no auto-gen
   else
     echo processing $dr
-    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
     ( cd $dr
-      macrosdir=`find . -name macros -print`
-      for i in $macrodirs; do
-       if test -f $i/gnome-gettext.m4; then
-         DELETEFILES="$DELETEFILES $i/gnome-gettext.m4"
-       fi
-      done
 
-      echo "deletefiles is $DELETEFILES"
       aclocalinclude="$ACLOCAL_FLAGS"
-      for k in $aclocalinclude; do
-       if test -d $k; then
-         if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
-           rm -f $DELETEFILES
-         fi
-        fi
-      done
-      for k in $macrodirs; do
-       if test -d $k; then
-          aclocalinclude="$aclocalinclude -I $k"
-         if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
-           rm -f $DELETEFILES
-         fi
-        fi
-      done
       if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
        if grep "sed.*POTFILES" configure.in >/dev/null; then
          : do nothing -- we still have an old unmodified configure.in