aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
authorElliot Lee <sopwith@src.gnome.org>2000-01-15 01:29:49 +0800
committerElliot Lee <sopwith@src.gnome.org>2000-01-15 01:29:49 +0800
commite1376086f9ba75d772ff08dd082faddf4f69e2a8 (patch)
tree4ada6f1167f1e5dc3b1512c21a3db29284b5b9ef /macros
parent4ac908c6ffa505ae3978eec809bf50fc7cb88e90 (diff)
downloadgsoc2013-evolution-e1376086f9ba75d772ff08dd082faddf4f69e2a8.tar
gsoc2013-evolution-e1376086f9ba75d772ff08dd082faddf4f69e2a8.tar.gz
gsoc2013-evolution-e1376086f9ba75d772ff08dd082faddf4f69e2a8.tar.bz2
gsoc2013-evolution-e1376086f9ba75d772ff08dd082faddf4f69e2a8.tar.lz
gsoc2013-evolution-e1376086f9ba75d772ff08dd082faddf4f69e2a8.tar.xz
gsoc2013-evolution-e1376086f9ba75d772ff08dd082faddf4f69e2a8.tar.zst
gsoc2013-evolution-e1376086f9ba75d772ff08dd082faddf4f69e2a8.zip
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
Diffstat (limited to 'macros')
-rw-r--r--macros/Makefile.am2
-rw-r--r--macros/autogen.sh5
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