]>
Commit | Line | Data |
---|---|---|
f0d44548 JB |
1 | --- XSB/build/configure.in.orig 2011-12-15 22:06:14.000000000 +0100 |
2 | +++ XSB/build/configure.in 2012-04-20 21:32:04.679356156 +0200 | |
3 | @@ -555,14 +555,7 @@ | |
4 | else | |
5 | canonical=`${CONFIG_SHELL-/bin/sh} ./config.sub $configuration 2>&1` | |
6 | ||
7 | - if test -n "`echo "$canonical" | sed -e [s/${configuration}//]`" ; then | |
8 | - echo $canonical | |
9 | - echo "" | |
10 | - rm -f buildxsb.lock | |
11 | - exit 1 | |
12 | - else | |
13 | AC_MSG_NOTICE([checking host system type... $canonical]) | |
14 | - fi | |
15 | fi | |
16 | ||
17 | ||
18 | @@ -1704,6 +1704,7 @@ | |
19 | ### Specify what will be substituted into Makefile, xsb_config.h, etc. | |
20 | AC_SUBST(xsb_version) | |
21 | AC_SUBST(canonical) | |
22 | +AC_SUBST(configuration) | |
23 | AC_SUBST(full_config_name) | |
24 | AC_SUBST(topdir) | |
25 | AC_SUBST(prefix) | |
26 | --- XSB/build/xsb.in.orig 2011-09-09 12:18:44.000000000 +0200 | |
27 | +++ XSB/build/xsb.in 2012-04-22 07:30:27.610140318 +0200 | |
28 | @@ -74,8 +74,8 @@ | |
29 | scriptdir=`dirname $thisfile` | |
30 | topdir=`dirname $scriptdir` | |
31 | ||
32 | -config=`$topdir/build/config.guess` | |
33 | -canonical=`$topdir/build/config.sub $config` | |
34 | +config="@configuration@" | |
35 | +canonical="@canonical@" | |
36 | exec_dir=$topdir/config/${canonical}${suffix} | |
37 | executable=${exec_dir}/bin/xsb | |
38 |