1.1 --- a/common/autoconf/builddeps.m4 Fri Jun 01 14:11:59 2012 -0700
1.2 +++ b/common/autoconf/builddeps.m4 Thu Jun 07 20:25:06 2012 -0700
1.3 @@ -34,7 +34,7 @@
1.4 . $builddepsfile
1.5 AC_MSG_RESULT([loaded!])
1.6 else
1.7 - AC_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!])
1.8 + AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!])
1.9 fi
1.10 else
1.11 AC_MSG_CHECKING([for builddeps.conf files in sources...])
1.12 @@ -47,7 +47,7 @@
1.13 . $builddepsfile
1.14 AC_MSG_RESULT([found at least one!])
1.15 else
1.16 - AC_ERROR([Could not find any builddeps.conf at all!])
1.17 + AC_MSG_ERROR([Could not find any builddeps.conf at all!])
1.18 fi
1.19 fi
1.20 # Create build and host names that use _ instead of "-" and ".".
1.21 @@ -117,7 +117,7 @@
1.22 ) | ftp -in $FTPSERVER
1.23 fi
1.24 if test "x$VALID_TOOL" != xyes; then
1.25 - AC_ERROR([I do not know how to use the tool: $BDEPS_FTP])
1.26 + AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP])
1.27 fi
1.28 ])
1.29
1.30 @@ -159,7 +159,7 @@
1.31 thecflags=${builddep_$2_CFLAGS}
1.32 thelibs=${builddep_$2_LIBS}
1.33 if test "x$depdir" = x; then
1.34 - AC_ERROR([Could not download build dependency $2])
1.35 + AC_MSG_ERROR([Could not download build dependency $2])
1.36 fi
1.37 $1=$depdir
1.38 if test "x$theroot" != x; then
1.39 @@ -198,17 +198,17 @@
1.40 mkdir -p $installdir
1.41 fi
1.42 if test ! -d $installdir; then
1.43 - AC_ERROR([Could not create directory $installdir])
1.44 + AC_MSG_ERROR([Could not create directory $installdir])
1.45 fi
1.46 tmpfile=`mktemp $installdir/$1.XXXXXXXXX`
1.47 touch $tmpfile
1.48 if test ! -f $tmpfile; then
1.49 - AC_ERROR([Could not create files in directory $installdir])
1.50 + AC_MSG_ERROR([Could not create files in directory $installdir])
1.51 fi
1.52 BDEPS_FTPGET([$3/$2] , [$tmpfile])
1.53 mv $tmpfile $installdir/$filename
1.54 if test ! -s $installdir/$filename; then
1.55 - AC_ERROR([Could not download $3/$2])
1.56 + AC_MSG_ERROR([Could not download $3/$2])
1.57 fi
1.58 case "$extension" in
1.59 zip) echo "Unzipping $installdir/$filename..."
1.60 @@ -220,7 +220,7 @@
1.61 tgz) echo "Untaring $installdir/$filename..."
1.62 (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
1.63 ;;
1.64 - *) AC_ERROR([Cannot handle build depency archive with extension $extension])
1.65 + *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension])
1.66 ;;
1.67 esac
1.68 fi
1.69 @@ -228,4 +228,3 @@
1.70 $5=$installdir
1.71 fi
1.72 ])
1.73 -
