Permalink
Browse files

Make SilverLeo happy :P

By displaying info about available and required SWIGs in ./configure
  • Loading branch information...
DarthGandalf committed Aug 15, 2012
1 parent a4d99e2 commit 16f510f820f23ced063bce00ce7a56c74979999d
Showing with 8 additions and 2 deletions.
  1. +1 −1 configure.ac
  2. +7 −1 m4/ac_pkg_swig.m4
View
@@ -321,7 +321,7 @@ if test "x$PERL" != xno -o "x$PYTHON" != xno; then
AC_PROG_SWIG([2.0.4])
test -z "$SWIG" && USESWIG=no
if test "x$USESWIG" = xno -a "x$old_USESWIG" = yes; then
- AC_MSG_ERROR([Could not found appropriate SWIG installation])
+ AC_MSG_ERROR([Could not found appropriate SWIG installation. Check config.log for details.])
fi
fi
if test "x$USESWIG" = xno; then
View
@@ -76,14 +76,17 @@ AC_DEFUN([AC_PROG_SWIG],[
std::list<int>::size_type checkList();
std::deque<int>::size_type checkDeque();
END
- AC_CACHE_CHECK([for SWIG], [znc_cv_path_SWIG], [
+ SWIG_installed_versions=""
+ AC_CACHE_CHECK([for SWIG >= $1], [znc_cv_path_SWIG], [
AC_PATH_PROGS_FEATURE_CHECK([SWIG], [swig swig2.0], [
echo trying $ac_path_SWIG >&AS_MESSAGE_LOG_FD
$ac_path_SWIG -version >&AS_MESSAGE_LOG_FD
[swig_version=`$ac_path_SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
if test -n "$swig_version"; then
swig_right_version=1
+ SWIG_installed_versions="$SWIG_installed_versions $swig_version "
+
if test -n "$required"; then
# Calculate the available version number components
[available=$swig_version]
@@ -150,6 +153,9 @@ AC_DEFUN([AC_PROG_SWIG],[
])
])
rm -f conftest-python.i conftest-perl.i
+ if test -n "$SWIG_installed_versions"; then
+ AC_MSG_NOTICE([Following SWIG versions are found:$SWIG_installed_versions])
+ fi
AC_SUBST([SWIG], [$znc_cv_path_SWIG])
if test -n "$SWIG"; then

0 comments on commit 16f510f

Please sign in to comment.