diff options
author | Sebastian Pop <sebastian.pop@amd.com> | 2008-09-04 05:57:10 +0000 |
---|---|---|
committer | Sebastian Pop <spop@gcc.gnu.org> | 2008-09-04 05:57:10 +0000 |
commit | d789184e741fa75916c104a333108d05c2534aba (patch) | |
tree | 870b42fa7cd1f98f603bae7f05221ec6e22d92f2 | |
parent | 0da366c7378372ad8c433e1b06e7329e5dd7f58b (diff) | |
download | gcc-d789184e741fa75916c104a333108d05c2534aba.zip gcc-d789184e741fa75916c104a333108d05c2534aba.tar.gz gcc-d789184e741fa75916c104a333108d05c2534aba.tar.bz2 |
configure.ac (--with-cloog-polylib): New.
2008-09-03 Sebastian Pop <sebastian.pop@amd.com>
* configure.ac (--with-cloog-polylib): New.
(--disable-cloog-version-check): New.
(--disable-ppl-version-check): New.
* configure: Re-generate.
From-SVN: r139973
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | configure | 162 | ||||
-rw-r--r-- | configure.ac | 66 |
3 files changed, 146 insertions, 89 deletions
@@ -1,3 +1,10 @@ +2008-09-03 Sebastian Pop <sebastian.pop@amd.com> + + * configure.ac (--with-cloog-polylib): New. + (--disable-cloog-version-check): New. + (--disable-ppl-version-check): New. + * configure: Re-generate. + 2008-09-03 Richard Guenther <rguenther@suse.de> * configure.ac: Always pass -DCLOOG_PPL_BACKEND to the @@ -935,6 +935,8 @@ Optional Features: --enable-gold use gold instead of ld --enable-libada build libada directory --enable-libssp build libssp directory + --disable-ppl-version-check disable check for PPL version + --disable-cloog-version-check disable check for CLooG version --enable-stage1-languages[=all] choose additional languages to build during stage1. Mostly useful for compiler development. --enable-objc-gc enable use of Boehm's garbage collector with the @@ -972,11 +974,12 @@ Optional Packages: plus --with-ppl-lib=PATH/lib --with-ppl-include=PATH Specify directory for installed PPL include files --with-ppl-lib=PATH Specify the directory for the installed PPL library - --with-cloog=PATH Specify prefix directory for the installed CLOOG package + --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL package Equivalent to --with-cloog-include=PATH/include plus --with-cloog-lib=PATH/lib - --with-cloog-include=PATH Specify directory for installed CLOOG include files - --with-cloog-lib=PATH Specify the directory for the installed CLOOG library + --with-cloog-include=PATH Specify directory for installed CLooG include files + --with-cloog-lib=PATH Specify the directory for the installed CLooG library + --with-cloog-polylib=PATH Specify prefix directory for the installed CLooG-PolyLib package --with-build-sysroot=SYSROOT use sysroot as the system root during the build --with-debug-prefix-map='A=B C=D ...' @@ -4845,58 +4848,20 @@ if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; LIBS="$ppllibs $LIBS" fi -# Flags needed for PPL - - - - -# Check for CLOOG -clooglibs= -clooginc= - - -# Check whether --with-cloog or --without-cloog was given. -if test "${with_cloog+set}" = set; then - withval="$with_cloog" - -fi; - -# Check whether --with-cloog_include or --without-cloog_include was given. -if test "${with_cloog_include+set}" = set; then - withval="$with_cloog_include" - -fi; - -# Check whether --with-cloog_lib or --without-cloog_lib was given. -if test "${with_cloog_lib+set}" = set; then - withval="$with_cloog_lib" - +# Check whether --enable-ppl-version-check or --disable-ppl-version-check was given. +if test "${enable_ppl_version_check+set}" = set; then + enableval="$enable_ppl_version_check" + ENABLE_PPL_CHECK=$enableval +else + ENABLE_PPL_CHECK=yes fi; -if test "x$with_cloog" != x; then - clooglibs="-L$with_cloog/lib -lcloog" - clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " - LIBS="$clooglibs $LIBS" -fi -if test "x$with_cloog_include" != x; then - clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND " -fi -if test "x$with_cloog_lib" != x; then - clooglibs="-L$with_cloog_lib -lcloog" - LIBS="$clooglibs $LIBS" -fi -if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then - clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog ' - clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND ' - LIBS="$clooglibs $LIBS" -fi - -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $pplinc $gmpinc" - -echo "$as_me:$LINENO: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5 +if test "${ENABLE_PPL_CHECK}" = "yes"; then + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $pplinc $gmpinc" + echo "$as_me:$LINENO: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5 echo $ECHO_N "checking for version $ppl_major_version.$ppl_minor_version of PPL... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4907,9 +4872,9 @@ int main () { -#if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version -choke me -#endif + #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version + choke me + #endif ; return 0; @@ -4944,17 +4909,83 @@ else sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; clooglibs= ; clooginc= +echo "${ECHO_T}no" >&6; ppllibs= ; pplinc= fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS="$saved_CFLAGS" + CFLAGS="$saved_CFLAGS" +fi + +# Flags needed for PPL + + -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $clooginc -DCLOOG_PPL_BACKEND $gmpinc $pplinc" -echo "$as_me:$LINENO: checking for correct version of CLooG" >&5 +# Check for CLOOG +clooglibs= +clooginc=" -DCLOOG_PPL_BACKEND " + + +# Check whether --with-cloog or --without-cloog was given. +if test "${with_cloog+set}" = set; then + withval="$with_cloog" + +fi; + +# Check whether --with-cloog_include or --without-cloog_include was given. +if test "${with_cloog_include+set}" = set; then + withval="$with_cloog_include" + +fi; + +# Check whether --with-cloog_lib or --without-cloog_lib was given. +if test "${with_cloog_lib+set}" = set; then + withval="$with_cloog_lib" + +fi; + +# Check whether --with-cloog-polylib or --without-cloog-polylib was given. +if test "${with_cloog_polylib+set}" = set; then + withval="$with_cloog_polylib" + +fi; + +if test "x$with_cloog" != x; then + clooglibs="-L$with_cloog/lib -lcloog" + clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " + LIBS="$clooglibs $LIBS" +fi +if test "x$with_cloog_polylib" != x; then + clooglibs="-L$with_cloog/lib -lcloog" + clooginc="-I$with_cloog/include " + LIBS="$clooglibs $LIBS" +fi +if test "x$with_cloog_include" != x; then + clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND " +fi +if test "x$with_cloog_lib" != x; then + clooglibs="-L$with_cloog_lib -lcloog" + LIBS="$clooglibs $LIBS" +fi +if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then + clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog ' + clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND ' + LIBS="$clooglibs $LIBS" +fi + +# Check whether --enable-cloog-version-check or --disable-cloog-version-check was given. +if test "${enable_cloog_version_check+set}" = set; then + enableval="$enable_cloog_version_check" + ENABLE_CLOOG_CHECK=$enableval +else + ENABLE_CLOOG_CHECK=yes +fi; + +if test "${ENABLE_CLOOG_CHECK}" = "yes"; then + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc" + echo "$as_me:$LINENO: checking for correct version of CLooG" >&5 echo $ECHO_N "checking for correct version of CLooG... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4965,9 +4996,9 @@ int main () { -#if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 -choke me -#endif + #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 + choke me + #endif ; return 0; @@ -5005,7 +5036,8 @@ echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; clooglibs= ; clooginc= fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS="$saved_CFLAGS" + CFLAGS="$saved_CFLAGS" +fi # Flags needed for CLOOG diff --git a/configure.ac b/configure.ac index 9d25cd2..b7e4461 100644 --- a/configure.ac +++ b/configure.ac @@ -1341,6 +1341,23 @@ if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; LIBS="$ppllibs $LIBS" fi +AC_ARG_ENABLE(ppl-version-check, +[ --disable-ppl-version-check disable check for PPL version], +ENABLE_PPL_CHECK=$enableval, +ENABLE_PPL_CHECK=yes) + +if test "${ENABLE_PPL_CHECK}" = "yes"; then + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $pplinc $gmpinc" + AC_MSG_CHECKING([for version $ppl_major_version.$ppl_minor_version of PPL]) + AC_TRY_COMPILE([#include "ppl_c.h"],[ + #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version + choke me + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ]) + CFLAGS="$saved_CFLAGS" +fi + # Flags needed for PPL AC_SUBST(ppllibs) AC_SUBST(pplinc) @@ -1348,19 +1365,25 @@ AC_SUBST(pplinc) # Check for CLOOG clooglibs= -clooginc= +clooginc=" -DCLOOG_PPL_BACKEND " -AC_ARG_WITH(cloog, [ --with-cloog=PATH Specify prefix directory for the installed CLOOG package +AC_ARG_WITH(cloog, [ --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL package Equivalent to --with-cloog-include=PATH/include plus --with-cloog-lib=PATH/lib]) -AC_ARG_WITH(cloog_include, [ --with-cloog-include=PATH Specify directory for installed CLOOG include files]) -AC_ARG_WITH(cloog_lib, [ --with-cloog-lib=PATH Specify the directory for the installed CLOOG library]) +AC_ARG_WITH(cloog_include, [ --with-cloog-include=PATH Specify directory for installed CLooG include files]) +AC_ARG_WITH(cloog_lib, [ --with-cloog-lib=PATH Specify the directory for the installed CLooG library]) +AC_ARG_WITH(cloog-polylib, [ --with-cloog-polylib=PATH Specify prefix directory for the installed CLooG-PolyLib package]) if test "x$with_cloog" != x; then clooglibs="-L$with_cloog/lib -lcloog" clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " LIBS="$clooglibs $LIBS" fi +if test "x$with_cloog_polylib" != x; then + clooglibs="-L$with_cloog/lib -lcloog" + clooginc="-I$with_cloog/include " + LIBS="$clooglibs $LIBS" +fi if test "x$with_cloog_include" != x; then clooginc="-I$with_cloog_include -DCLOOG_PPL_BACKEND " fi @@ -1374,27 +1397,22 @@ if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir LIBS="$clooglibs $LIBS" fi -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $pplinc $gmpinc" +AC_ARG_ENABLE(cloog-version-check, +[ --disable-cloog-version-check disable check for CLooG version], +ENABLE_CLOOG_CHECK=$enableval, +ENABLE_CLOOG_CHECK=yes) -AC_MSG_CHECKING([for version $ppl_major_version.$ppl_minor_version of PPL]) -AC_TRY_COMPILE([#include "ppl_c.h"],[ -#if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version -choke me -#endif -], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ]) -CFLAGS="$saved_CFLAGS" - -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $clooginc -DCLOOG_PPL_BACKEND $gmpinc $pplinc" - -AC_MSG_CHECKING([for correct version of CLooG]) -AC_TRY_COMPILE([#include "cloog/cloog.h"],[ -#if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 -choke me -#endif -], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ]) -CFLAGS="$saved_CFLAGS" +if test "${ENABLE_CLOOG_CHECK}" = "yes"; then + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc" + AC_MSG_CHECKING([for correct version of CLooG]) + AC_TRY_COMPILE([#include "cloog/cloog.h"],[ + #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 + choke me + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ]) + CFLAGS="$saved_CFLAGS" +fi # Flags needed for CLOOG AC_SUBST(clooglibs) |