diff options
| -rw-r--r-- | config/open-axiom.m4 | 14 | ||||
| -rwxr-xr-x | configure | 31 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 39 insertions, 11 deletions
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 747319aa..ac4610b8 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -43,6 +43,20 @@ case $host in esac ]) +dnl ------------------------------------------ +dnl -- OPENAXIOM_CHECK_FOR_ADDITIONAL_PATHS -- +dnl ------------------------------------------ +AC_DEFUN([OPENAXIOM_CHECK_FOR_ADDITIONAL_PATHS],[ +# If there is a MacPort installation of QT5, use it. +case $host in + *darwin*) + if test -d /opt/local/libexec/qt5; then + PATH=/opt/local/libexec/qt5/bin:$PATH + fi + ;; +esac +]) + dnl ---------------------------------- dnl -- OPENAXIOM_REJECT_ROTTED_LISP -- dnl ---------------------------------- @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2016-01-24. +# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2016-02-07. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.5.0-2016-01-24' -PACKAGE_STRING='OpenAxiom 1.5.0-2016-01-24' +PACKAGE_VERSION='1.5.0-2016-02-07' +PACKAGE_STRING='OpenAxiom 1.5.0-2016-02-07' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -1420,7 +1420,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.5.0-2016-01-24 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.5.0-2016-02-07 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1495,7 +1495,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2016-01-24:";; + short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2016-02-07:";; esac cat <<\_ACEOF @@ -1612,7 +1612,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.5.0-2016-01-24 +OpenAxiom configure 1.5.0-2016-02-07 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2429,7 +2429,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.5.0-2016-01-24, which was +It was created by OpenAxiom $as_me 1.5.0-2016-02-07, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3448,7 +3448,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.5.0-2016-01-24' + VERSION='1.5.0-2016-02-07' cat >>confdefs.h <<_ACEOF @@ -3546,6 +3546,17 @@ fi +# If there is a MacPort installation of QT5, use it. +case $host in + *darwin*) + if test -d /opt/local/libexec/qt5; then + PATH=/opt/local/libexec/qt5/bin:$PATH + fi + ;; +esac + + + open_axiom_installdir=$libdir/open-axiom/$target/$PACKAGE_VERSION @@ -20055,7 +20066,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.5.0-2016-01-24, which was +This file was extended by OpenAxiom $as_me 1.5.0-2016-02-07, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20125,7 +20136,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenAxiom config.status 1.5.0-2016-01-24 +OpenAxiom config.status 1.5.0-2016-02-07 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index cf73d14c..19bdff7d 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ dnl Makefiles for building OpenAxiom interpreter, compiler, libraries, and dnl auxiliary tools where appropriate. dnl -AC_INIT([OpenAxiom], [1.5.0-2016-01-24], +AC_INIT([OpenAxiom], [1.5.0-2016-02-07], [open-axiom-bugs@lists.sf.net]) dnl Most of the macros used in this configure.ac are defined in files @@ -57,6 +57,9 @@ AC_PREREQ([2.62]) dnl Simple sanity check. AC_CONFIG_SRCDIR(src/Makefile.in) +dnl Look for PATHs to consider, on some exotic platforms. +OPENAXIOM_CHECK_FOR_ADDITIONAL_PATHS + open_axiom_installdir=$libdir/open-axiom/$target/$PACKAGE_VERSION AC_SUBST(open_axiom_installdir) |