aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJan-Benedict Glaw <jbglaw@lug-owl.de>2013-01-15 21:47:02 +0000
committerJan-Benedict Glaw <jbglaw@lug-owl.de>2013-01-15 21:47:02 +0000
commit3dae1673d0606fded77a0efc935812011634615f (patch)
treedd585845ab10bfa8f57025164df7f2341969725d /configure
parent1ed591746501739512df2ce4d9a2a0df6e8e71fd (diff)
downloadfsf-binutils-gdb-3dae1673d0606fded77a0efc935812011634615f.zip
fsf-binutils-gdb-3dae1673d0606fded77a0efc935812011634615f.tar.gz
fsf-binutils-gdb-3dae1673d0606fded77a0efc935812011634615f.tar.bz2
* configure.ac: Sync with GCC repo.
* configure: Ditto. * Makefile.def: Ditto. * Makefile.in: Ditto.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure112
1 files changed, 101 insertions, 11 deletions
diff --git a/configure b/configure
index 8a32275..30b6843 100755
--- a/configure
+++ b/configure
@@ -5819,6 +5819,8 @@ fi
isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
ENABLE_ISL_CHECK=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree ISL, disabling version check" >&5
+$as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
fi
@@ -5835,10 +5837,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
$as_echo_n "checking for version 0.10 of ISL... " >&6; }
-if test "${gcc_cv_isl+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
+ if test "$cross_compiling" = yes; then :
gcc_cv_isl=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5864,8 +5863,56 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
+$as_echo "$gcc_cv_isl" >&6; }
+
+ CFLAGS=$_isl_saved_CFLAGS
+ LDFLAGS=$_isl_saved_LDFLAGS
+ LIBS=$_isl_saved_LIBS
+ fi
+
+
+ if test "${gcc_cv_isl}" = no ; then
+
+ if test "${ENABLE_ISL_CHECK}" = yes ; then
+ _isl_saved_CFLAGS=$CFLAGS
+ _isl_saved_LDFLAGS=$LDFLAGS
+ _isl_saved_LIBS=$LIBS
+
+ CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
+ LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
+ LIBS="${_isl_saved_LIBS} -lisl"
+ echo $CFLAGS
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 of ISL" >&5
+$as_echo_n "checking for version 0.11 of ISL... " >&6; }
+ if test "$cross_compiling" = yes; then :
+ gcc_cv_isl=yes
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <isl/version.h>
+ #include <string.h>
+int
+main ()
+{
+if (strncmp (isl_version (), "isl-0.11", strlen ("isl-0.11")) != 0)
+ return 1;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ gcc_cv_isl=yes
+else
+ gcc_cv_isl=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
$as_echo "$gcc_cv_isl" >&6; }
CFLAGS=$_isl_saved_CFLAGS
@@ -5874,6 +5921,7 @@ $as_echo "$gcc_cv_isl" >&6; }
fi
+ fi
@@ -5947,10 +5995,13 @@ fi
if test "x${with_cloog_lib}" != x; then
clooglibs="-L$with_cloog_lib"
fi
- if test "x${clooginc}" = x && test "x${clooglibs}" = x \
+ if test "x${clooginc}" = x && test "x${clooglibs}" = x \
&& test -d ${srcdir}/cloog; then
clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' '
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include '
+ ENABLE_CLOOG_CHECK=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using in-tree CLooG, disabling version check" >&5
+$as_echo "$as_me: WARNING: using in-tree CLooG, disabling version check" >&2;}
fi
clooginc="-DCLOOG_INT_GMP ${clooginc}"
@@ -5969,10 +6020,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17.0 of CLooG" >&5
$as_echo_n "checking for version 0.17.0 of CLooG... " >&6; }
-if test "${gcc_cv_cloog+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "cloog/version.h"
int
@@ -5993,8 +6041,49 @@ else
gcc_cv_cloog=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
+$as_echo "$gcc_cv_cloog" >&6; }
+
+ CFLAGS=$_cloog_saved_CFLAGS
+ LDFLAGS=$_cloog_saved_LDFLAGS
+ fi
+
+
+ if test "${gcc_cv_cloog}" = no ; then
+
+
+
+ if test "${ENABLE_CLOOG_CHECK}" = yes ; then
+ _cloog_saved_CFLAGS=$CFLAGS
+ _cloog_saved_LDFLAGS=$LDFLAGS
+
+ CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
+ LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18.0 of CLooG" >&5
+$as_echo_n "checking for version 0.18.0 of CLooG... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include "cloog/version.h"
+int
+main ()
+{
+#if CLOOG_VERSION_MAJOR != 0 \
+ || CLOOG_VERSION_MINOR != 18 \
+ || CLOOG_VERSION_REVISION < 0
+ choke me
+ #endif
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gcc_cv_cloog=yes
+else
+ gcc_cv_cloog=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
$as_echo "$gcc_cv_cloog" >&6; }
CFLAGS=$_cloog_saved_CFLAGS
@@ -6002,6 +6091,7 @@ $as_echo "$gcc_cv_cloog" >&6; }
fi
+ fi