From 7bfa001100f57fce93f7f0911dd23285816cce30 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Sun, 18 Feb 2007 02:26:20 +0000 Subject: [PATCH] Check for GNUSTEP_MAKEFILES, not GNUSTEP_SYSTEM_ROOT git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@24626 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ configure | 12 ++++++------ configure.ac | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee7369d..6c9f39a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-02-18 Nicola Pero + + * configure.ac: Check for GNUSTEP_MAKEFILES, not + GNUSTEP_SYSTEM_ROOT. + * configure: Regenerated. + 2007-01-25 Matt Rice * EOAccess/EOModel.h: Forward declare NSMutableArray class. diff --git a/configure b/configure index 8933635..a4b829d 100755 --- a/configure +++ b/configure @@ -718,13 +718,13 @@ echo X"$0" | /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then + if test ! -r $srcdir/$ac_unique_file; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r "$srcdir/$ac_unique_file"; then +if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } @@ -733,7 +733,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then { (exit 1); exit 1; }; } fi fi -(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null || +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` @@ -1297,9 +1297,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -z "$GNUSTEP_SYSTEM_ROOT"; then - { { echo "$as_me:$LINENO: error: You must run the GNUstep initialization script first!" >&5 -echo "$as_me: error: You must run the GNUstep initialization script first!" >&2;} +if test -z "$GNUSTEP_MAKEFILES"; then + { { echo "$as_me:$LINENO: error: You must set GNUSTEP_MAKEFILES or run the GNUstep initialization script first!" >&5 +echo "$as_me: error: You must set GNUSTEP_MAKEFILES or run the GNUstep initialization script first!" >&2;} { (exit 1); exit 1; }; } fi diff --git a/configure.ac b/configure.ac index fb6baea..17bf9de 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ builtin(include, config/postgres.m4)dnl builtin(include, config/sqlite3.m4)dnl AC_INIT -if test -z "$GNUSTEP_SYSTEM_ROOT"; then - AC_MSG_ERROR([You must run the GNUstep initialization script first!]) +if test -z "$GNUSTEP_MAKEFILES"; then + AC_MSG_ERROR([You must set GNUSTEP_MAKEFILES or run the GNUstep initialization script first!]) fi AC_CONFIG_HEADER(config.h)