------------------------------------------------------------
revno: 98
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: exceptions
timestamp: Fri 2007-05-04 13:58:35 -0700
message:
Actually fail on swig configure errors.
modified:
configure.in configure.in-20070228020914-u2pk759xg7thauwf-13
m4/ac_pkg_swig.m4 ac_pkg_swig.m4-20070414215316-ojjacm446lab2l0c-1
=== modified file 'configure.in'
--- a/configure.in 2007-05-04 20:45:38 +0000
+++ b/configure.in 2007-05-04 20:58:35 +0000
@@ -14,16 +14,15 @@
#AC_CHECK_PROGS(SWIG,swig)
if test "$with_php" = "no" ; then
AC_PROG_SWIG(1.3.28)
- if test "x$SWIG" == "x" ; then
- AC_MSG_ERROR([Couldn't find swig.])
- fi
else
AC_PROG_SWIG(1.3.32)
- if test "x$SWIG" == "x" ; then
+ if test "$SWIG" == "false" ; then
AC_MSG_ERROR([php support requires at least swig version 1.3.32])
- AC_MSG_ERROR([Couldn't find swig.])
fi
fi
+if test "x$SWIG" == "x" ; then
+ AC_MSG_ERROR([Couldn't find swig.])
+fi
AC_CHECK_PROGS(MONO,mono)
=== modified file 'm4/ac_pkg_swig.m4'
--- a/m4/ac_pkg_swig.m4 2007-04-14 23:02:27 +0000
+++ b/m4/ac_pkg_swig.m4 2007-05-04 20:58:35 +0000
@@ -71,7 +71,7 @@
-o $available_minor -ne $required_minor \
-o $available_patch -lt $required_patch ; then
AC_MSG_WARN([SWIG version >= $1 is required. You have
$swig_version. You should look at http://www.swig.org])
- SWIG='echo "Error: SWIG version >= $1 is required.
You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
+ SWIG=false
else
AC_MSG_NOTICE([SWIG executable is '$SWIG'])
SWIG_LIB=`$SWIG -swiglib`
| Thread |
|---|
| • Rev 98: Actually fail on swig configure errors. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/exceptions | Monty Taylor | 4 May |
