Fix for proper include directory. Remove gnome-gettext.m4 if needed. Stick

Fix for proper include directory.
Remove gnome-gettext.m4 if needed.
Stick gnome-gettext.m4 contents in gnome.m4

svn path=/trunk/; revision=1569

2 files changed, 6 insertions, 1 deletions

diff --git a/macros/Makefile.am b/macros/Makefile.am
index 1f5ca291a2..2b7b6ebbc8 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,11 +1,11 @@
 ## Please update this variable if any new macros are created
+
 MACROS=						\
   aclocal-include.m4				\
   compiler-flags.m4				\
   curses.m4					\
   gnome-bonobo-check.m4				\
   gnome-fileutils.m4				\
-  gnome-gettext.m4				\
   gnome-ghttp-check.m4				\
   gnome-gnorba-check.m4				\
   gnome-guile-checks.m4				\
diff --git a/macros/autogen.sh b/macros/autogen.sh
index 02821475fd..c1b687c6f3 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -85,6 +85,8 @@ xlc )
   am_opt=--include-deps;;
 esac
 
+DELETEME="gnome-gettext.m4"
+DELETEFILES="`find $srcdir -name $DELETEME`"
 for coin in `find $srcdir -name configure.in -print`
 do 
   dr=`dirname $coin`
@@ -98,6 +100,9 @@ do
       for k in $macrodirs; do
   	if test -d $k; then
           aclocalinclude="$aclocalinclude -I $k"
+	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1.0" ]; then
+	    rm -f $DELETEFILES
+	  fi
   	##else 
 	##  echo "**Warning**: No such directory \`$k'.  Ignored."
         fi