aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xautogen.sh9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ec9bd925a..e9d5bc202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-11-10 Wouter Bolsterlee <wbolster@cvs.gnome.org>
+ * autogen.sh: Add useful warning when gnome-autogen.sh
+ couldn't be found.
+
+2006-11-10 Wouter Bolsterlee <wbolster@cvs.gnome.org>
+
* src/ephy-lockdown.c: (update_window):
Also disable the "Open Image" context menu action if the
desktop wide "disable save to disk" lockdown key is
diff --git a/autogen.sh b/autogen.sh
index 52161ccba..0f5706350 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,16 +5,19 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
PKG_NAME="epiphany"
+REQUIRED_AUTOMAKE_VERSION=1.9
-(test -f $srcdir/src/ephy-window.c) || {
+(test -f $srcdir/configure.ac \
+ && test -f $srcdir/src/ephy-window.c) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
}
which gnome-autogen.sh || {
- echo "You need to install gnome-common from the GNOME CVS"
+ echo "You need to install gnome-common from GNOME CVS and make"
+ echo "sure the gnome-autogen.sh script is in your \$PATH."
exit 1
}
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh