Mercurial > octave-nkf

comparison configure.ac @ 15170:a44ff4f0a20b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add AX_COMPARE_VERSION.m4 macro m4/ dir to make configure.ac simpler. * configure.ac: Use new AX_COMPARE_VERSION macro in place of case statements * m4/module.mk: Add ax_compare_version.m4 to the build system. * m4/ax_compare_version.m4: New macro to compare versions in Autoconf files.
author Rik <rik@octave.org>
date Mon, 13 Aug 2012 15:43:49 -0700
parents 66dcad99b55e
children c7d466a02065
comparison
equal deleted inserted replaced
15169:6242904370bd 15170:a44ff4f0a20b
235 GXX_VERSION= 235 GXX_VERSION=
236 if test "$GXX" = yes; then 236 if test "$GXX" = yes; then
237 gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | \ 237 gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | \
238 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` 238 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'`
239 239
240 case "$gxx_version" in 240 AX_COMPARE_VERSION([$gxx_version], [lt], [3.5],
241 1.* | 2.[[0123456789]].* | 3.[[01234]].*) 241 [AC_MSG_ERROR([g++ version $gxx_version will probably fail to compile Octave])])
242 AC_MSG_ERROR([g++ version $gxx_version will probably fail to compile Octave]) 242
243 ;;
244 esac
245 GXX_VERSION="$gxx_version" 243 GXX_VERSION="$gxx_version"
246 fi 244 fi
247 AC_SUBST(GXX_VERSION) 245 AC_SUBST(GXX_VERSION)
248 246
249 ## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12 247 ## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12
284 GCC_VERSION= 282 GCC_VERSION=
285 if test "$GCC" = yes; then 283 if test "$GCC" = yes; then
286 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \ 284 gcc_version=`$CC -v 2>&1 | grep "^.*gcc version" | \
287 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'` 285 sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//' -e 's/ .*//'`
288 286
289 case "$gcc_version" in 287 AX_COMPARE_VERSION([$gcc_version], [lt], [3],
290 [12].*) 288 [warn_gcc_version="gcc version $gcc_version is likely to cause problems"
291 warn_gcc_version="gcc version $gcc_version is likely to cause problems" 289 OCTAVE_CONFIGURE_WARNING([warn_gcc_version])])
292 OCTAVE_CONFIGURE_WARNING([warn_gcc_version]) 290
293 ;;
294 esac
295 GCC_VERSION="$gcc_version" 291 GCC_VERSION="$gcc_version"
296 fi 292 fi
297 AC_SUBST(CC_VERSION) 293 AC_SUBST(CC_VERSION)
298 294
299 ## FIXME: CC_VERSION is deprecated and should be removed in version 3.12 295 ## FIXME: CC_VERSION is deprecated and should be removed in version 3.12