OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac: Adjust the ppl and cloog configure to work as documented.

Browse Source 
2009-10-21  Richard Guenther  <rguenther@suse.de>

	* configure.ac: Adjust the ppl and cloog configure to work as
	documented.  Disable cloog if ppl was disabled.  Omit the version
	checks if they were disabled.
	* configure: Re-generate.

From-SVN: r153055
This commit is contained in:
Richard Guenther 2009-10-21 11:40:17 +00:00 committed by Richard Biener
parent 3c28a5f48c
commit ad0abd3c90
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-10-21 Richard Guenther <rguenther@suse.de>
* configure.ac: Adjust the ppl and cloog configure to work as
documented. Disable cloog if ppl was disabled. Omit the version
checks if they were disabled.
* configure: Re-generate.
2009-10-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac: Add 'lto' to enable_languages, not

18
configure vendored
View File

@ -5750,7 +5750,7 @@ pplinc=
if test "${with_ppl+set}" = set; then :
withval=$with_ppl;
else
with_ppl=no
with_ppl=yes
fi
@ -5770,6 +5770,9 @@ case $with_ppl in
no)
ppllibs=
;;
yes)
LIBS="$ppllibs $LIBS"
;;
*)
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
pplinc="-I$with_ppl/include $pplinc"
@ -5797,7 +5800,7 @@ else
fi
if test "${ENABLE_PPL_CHECK}" = "yes"; then
if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $pplinc $gmpinc"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5
@ -5842,7 +5845,7 @@ clooginc=" -DCLOOG_PPL_BACKEND "
if test "${with_cloog+set}" = set; then :
withval=$with_cloog;
else
with_cloog=no
with_cloog=yes
fi
@ -5858,11 +5861,18 @@ if test "${with_cloog_lib+set}" = set; then :
fi
if test "x$with_ppl" == "xno"; then
with_cloog=no
fi
case $with_cloog in
no)
clooglibs=
clooginc=
;;
yes)
LIBS="$clooglibs $LIBS"
;;
*)
clooglibs="-L$with_cloog/lib -lcloog"
clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND "
@ -5890,7 +5900,7 @@ else
fi
if test "${ENABLE_CLOOG_CHECK}" = "yes"; then
if test "x$with_cloog" != "xno" -a "${ENABLE_CLOOG_CHECK}" = "yes"; then
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct version of CLooG" >&5

18
configure.ac
View File

@ -1514,7 +1514,7 @@ pplinc=
AC_ARG_WITH(ppl, [ --with-ppl=PATH Specify prefix directory for the installed PPL package
Equivalent to --with-ppl-include=PATH/include
plus --with-ppl-lib=PATH/lib],, with_ppl=no)
plus --with-ppl-lib=PATH/lib],, with_ppl=yes)
AC_ARG_WITH(ppl_include, [ --with-ppl-include=PATH Specify directory for installed PPL include files])
AC_ARG_WITH(ppl_lib, [ --with-ppl-lib=PATH Specify the directory for the installed PPL library])
@ -1522,6 +1522,9 @@ case $with_ppl in
no)
ppllibs=
;;
yes)
LIBS="$ppllibs $LIBS"
;;
*)
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
pplinc="-I$with_ppl/include $pplinc"
@ -1546,7 +1549,7 @@ AC_ARG_ENABLE(ppl-version-check,
ENABLE_PPL_CHECK=$enableval,
ENABLE_PPL_CHECK=yes)
if test "${ENABLE_PPL_CHECK}" = "yes"; then
if test "x$with_ppl" != "xno" -a "${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])
@ -1569,15 +1572,22 @@ clooginc=" -DCLOOG_PPL_BACKEND "
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],, with_cloog=no)
plus --with-cloog-lib=PATH/lib],, with_cloog=yes)
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])
if test "x$with_ppl" == "xno"; then
with_cloog=no
fi
case $with_cloog in
no)
clooglibs=
clooginc=
;;
yes)
LIBS="$clooglibs $LIBS"
;;
*)
clooglibs="-L$with_cloog/lib -lcloog"
clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND "
@ -1602,7 +1612,7 @@ AC_ARG_ENABLE(cloog-version-check,
ENABLE_CLOOG_CHECK=$enableval,
ENABLE_CLOOG_CHECK=yes)
if test "${ENABLE_CLOOG_CHECK}" = "yes"; then
if test "x$with_cloog" != "xno" -a "${ENABLE_CLOOG_CHECK}" = "yes"; then
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc"
AC_MSG_CHECKING([for correct version of CLooG])