matteo/sgpemv2
matteo
/
sgpemv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added fatal errors when swig isn't found 

- Downgraded gettext reqs


git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@176 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog 2006-01-17 10:23:22 +00:00
parent 3c1883fafd
commit 19725e3891
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-01-15 19:40 tchernobog
* trunk/ChangeLog, trunk/Makefile.am, trunk/configure.ac,
trunk/src/Makefile.am, trunk/src/main.cc, trunk/src/testsuite,
trunk/src/testsuite/Makefile.am: - Lay out directory for keeping
tests - Create Makefile for sources, add main.cc that just prints
the license as a test for the rules.
2006-01-13 17:30 tchernobog 2006-01-13 17:30 tchernobog
* trunk/ChangeLog, trunk/configure.ac, trunk/doc/Makefile.am: - Add * trunk/ChangeLog, trunk/configure.ac, trunk/doc/Makefile.am: - Add

2
configure.ac
View File

@ -47,7 +47,7 @@ AM_INIT_AUTOMAKE([dejagnu])
dnl gettext & libtool dnl gettext & libtool
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.14.5]) AM_GNU_GETTEXT_VERSION([0.14.1])
dnl various requisites dnl various requisites
GTKMM_VERSION=2.8.0 GTKMM_VERSION=2.8.0

10
m4/ac_pkg_swig.m4
View File

@ -25,11 +25,12 @@ dnl @author Andrew Collier <abcollier@yahoo.com>
dnl @version 2004-09-20 dnl @version 2004-09-20
dnl @license GPLWithACException dnl @license GPLWithACException
dnl Matteo Settenvini : changed warnings with errors
AC_DEFUN([AC_PROG_SWIG],[ AC_DEFUN([AC_PROG_SWIG],[
AC_PATH_PROG([SWIG],[swig]) AC_PATH_PROG([SWIG],[swig])
if test -z "$SWIG" ; then if test -z "$SWIG" ; then
AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org]) AC_MSG_ERROR([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'
elif test -n "$1" ; then elif test -n "$1" ; then
AC_MSG_CHECKING([for SWIG version]) 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'`] [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'`]
@ -70,15 +71,14 @@ AC_DEFUN([AC_PROG_SWIG],[
if test $available_major -ne $required_major \ if test $available_major -ne $required_major \
-o $available_minor -ne $required_minor \ -o $available_minor -ne $required_minor \
-o $available_patch -lt $required_patch ; then -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]) AC_MSG_ERROR([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'
else else
AC_MSG_NOTICE([SWIG executable is '$SWIG']) AC_MSG_NOTICE([SWIG executable is '$SWIG'])
SWIG_LIB=`$SWIG -swiglib` SWIG_LIB=`$SWIG -swiglib`
AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB']) AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
fi fi
else else
AC_MSG_WARN([cannot determine SWIG version]) AC_MSG_ERROR([cannot determine SWIG version])
SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false' SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
fi fi
fi fi