summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2009-12-06 10:36:14 +0100
committerGravatar Matt Colyer2009-12-06 13:58:40 -0800
commit3bb7d9596e9b852b2e13185386cc0b71c952e84d (patch)
tree31dee21d6b27d8b626aebeaf5650db0fffda4d53 /m4
parent15b9f3451e20ccb4f9c6cdadc0dd75bc72246360 (diff)
downloadlibimobiledevice-3bb7d9596e9b852b2e13185386cc0b71c952e84d.tar.gz
libimobiledevice-3bb7d9596e9b852b2e13185386cc0b71c952e84d.tar.bz2
Updated autofoo stuff; swig is now optional and can be disabled.
Use --without-swig to prevent building the swig extensions even if swig is installed. [#93 state:resolved] Signed-off-by: Matt Colyer <matt@colyer.name>
Diffstat (limited to 'm4')
-rw-r--r--m4/ac_pkg_swig.m48
-rw-r--r--m4/ax_swig_enable_cxx.m44
2 files changed, 7 insertions, 5 deletions
diff --git a/m4/ac_pkg_swig.m4 b/m4/ac_pkg_swig.m4
index 738f69d..97244bc 100644
--- a/m4/ac_pkg_swig.m4
+++ b/m4/ac_pkg_swig.m4
@@ -64,8 +64,8 @@
AC_DEFUN([AC_PROG_SWIG],[
AC_PATH_PROG([SWIG],[swig])
if test -z "$SWIG" ; then
- AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
- SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
+ AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org] or install your distribution specific swig package.)
+ SWIG=false
elif test -n "$1" ; then
AC_MSG_CHECKING([for SWIG version])
[swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
@@ -107,7 +107,7 @@ AC_DEFUN([AC_PROG_SWIG],[
-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`
@@ -115,7 +115,7 @@ AC_DEFUN([AC_PROG_SWIG],[
fi
else
AC_MSG_WARN([cannot determine SWIG version])
- SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
+ SWIG=false
fi
fi
AC_SUBST([SWIG_LIB])
diff --git a/m4/ax_swig_enable_cxx.m4 b/m4/ax_swig_enable_cxx.m4
index 722caeb..c1eca8c 100644
--- a/m4/ax_swig_enable_cxx.m4
+++ b/m4/ax_swig_enable_cxx.m4
@@ -47,5 +47,7 @@ AU_ALIAS([SWIG_ENABLE_CXX], [AX_SWIG_ENABLE_CXX])
AC_DEFUN([AX_SWIG_ENABLE_CXX],[
AC_REQUIRE([AC_PROG_SWIG])
AC_REQUIRE([AC_PROG_CXX])
- SWIG="$SWIG -c++"
+ if test "$SWIG" != "false"; then
+ SWIG="$SWIG -c++"
+ fi
])