Add -lpwl to ppllibs, and -lisl to clooglibs.
2011-03-02 Sebastian Pop <sebastian.pop@amd.com> * configure.ac: Add -lpwl to ppllibs. * config/cloog.m4: Add -lisl to clooglibs. * configure: Regenerated.
This commit is contained in:
Sebastian Pop
parent
7a3190f081
commit
2e4cdd5582
|
|
@ -1,3 +1,9 @@
|
|||
2011-03-02 Sebastian Pop <sebastian.pop@amd.com>
|
||||
|
||||
* configure.ac: Add -lpwl to ppllibs.
|
||||
* config/cloog.m4: Add -lisl to clooglibs.
|
||||
* configure: Regenerated.
|
||||
|
||||
2011-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
Import from Libtool and gnulib:
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
|
|||
;;
|
||||
"ISL")
|
||||
clooginc="${clooginc} ${_cloogorginc}"
|
||||
clooglibs="${clooglibs} -lcloog-isl"
|
||||
clooglibs="${clooglibs} -lcloog-isl -lisl"
|
||||
cloog_org=yes
|
||||
;;
|
||||
"PPL")
|
||||
|
|
|
|||
|
|
@ -5660,8 +5660,9 @@ fi
|
|||
|
||||
|
||||
# Check for PPL
|
||||
ppllibs=" -lppl_c -lppl -lgmpxx"
|
||||
ppllibs=
|
||||
pplinc=
|
||||
pwllib=
|
||||
|
||||
|
||||
# Check whether --with-ppl was given.
|
||||
|
|
@ -5682,42 +5683,100 @@ if test "${with_ppl_lib+set}" = set; then :
|
|||
fi
|
||||
|
||||
|
||||
case $with_ppl in
|
||||
no)
|
||||
ppllibs=
|
||||
;;
|
||||
"" | yes)
|
||||
;;
|
||||
*)
|
||||
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
|
||||
pplinc="-I$with_ppl/include $pplinc"
|
||||
;;
|
||||
esac
|
||||
if test "x$with_ppl_include" != x; then
|
||||
pplinc="-I$with_ppl_include $pplinc"
|
||||
fi
|
||||
if test "x$with_ppl_lib" != x; then
|
||||
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
|
||||
fi
|
||||
if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
|
||||
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"' -lppl_c -lppl -lgmpxx '
|
||||
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
|
||||
enable_ppl_version_check=no
|
||||
fi
|
||||
|
||||
# Check whether --enable-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
|
||||
enableval=$enable_ppl_version_check;
|
||||
fi
|
||||
|
||||
|
||||
if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
|
||||
case $with_ppl in
|
||||
yes | no | "")
|
||||
;;
|
||||
*)
|
||||
ppllibs="-L$with_ppl/lib"
|
||||
pplinc="-I$with_ppl/include $pplinc"
|
||||
if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then
|
||||
with_ppl=yes
|
||||
else
|
||||
as_fn_error "cannot find directories \"$with_ppl/lib\" or \"$with_ppl/include\"" "$LINENO" 5
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if test x"$with_ppl_include" != x; then
|
||||
pplinc="-I$with_ppl_include $pplinc"
|
||||
with_ppl=yes
|
||||
fi
|
||||
|
||||
if test "x$with_ppl_lib" != x; then
|
||||
ppllibs="-L$with_ppl_lib"
|
||||
with_ppl=yes
|
||||
fi
|
||||
|
||||
if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
|
||||
if test x"$enable_watchdog" = xyes; then
|
||||
pwllib="-lpwl"
|
||||
fi
|
||||
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"
|
||||
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
|
||||
enable_ppl_version_check=no
|
||||
with_ppl=yes
|
||||
fi
|
||||
|
||||
if test "x$with_ppl" = xyes; then
|
||||
if test "x$pwllib" = x; then
|
||||
saved_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS $ppllibs"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PWL_handle_timeout in -lpwl" >&5
|
||||
$as_echo_n "checking for PWL_handle_timeout in -lpwl... " >&6; }
|
||||
if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lpwl $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char PWL_handle_timeout ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return PWL_handle_timeout ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_pwl_PWL_handle_timeout=yes
|
||||
else
|
||||
ac_cv_lib_pwl_PWL_handle_timeout=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pwl_PWL_handle_timeout" >&5
|
||||
$as_echo "$ac_cv_lib_pwl_PWL_handle_timeout" >&6; }
|
||||
if test "x$ac_cv_lib_pwl_PWL_handle_timeout" = x""yes; then :
|
||||
pwllib="-lpwl"
|
||||
fi
|
||||
|
||||
LDFLAGS="$saved_LDFLAGS"
|
||||
fi
|
||||
|
||||
ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
|
||||
|
||||
if test "$enable_ppl_version_check" != no; then
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $pplinc $gmpinc"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (or later revision) of PPL" >&5
|
||||
$as_echo_n "checking for version 0.11 (or later revision) of PPL... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (revision 0 or later) of PPL" >&5
|
||||
$as_echo_n "checking for version 0.11 (revision 0 or later) of PPL... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include "ppl_c.h"
|
||||
|
|
@ -5742,6 +5801,7 @@ $as_echo "no" >&6; }; ppllibs= ; pplinc= ; with_ppl=no
|
|||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Flags needed for PPL
|
||||
|
|
@ -5963,7 +6023,7 @@ $as_echo "$gcc_cv_cloog_type" >&6; }
|
|||
;;
|
||||
"ISL")
|
||||
clooginc="${clooginc} ${_cloogorginc}"
|
||||
clooglibs="${clooglibs} -lcloog-isl"
|
||||
clooglibs="${clooglibs} -lcloog-isl -lisl"
|
||||
cloog_org=yes
|
||||
;;
|
||||
"PPL")
|
||||
|
|
|
|||
79
configure.ac
79
configure.ac
|
|
@ -1621,8 +1621,9 @@ AC_ARG_WITH(boot-ldflags,
|
|||
AC_SUBST(poststage1_ldflags)
|
||||
|
||||
# Check for PPL
|
||||
ppllibs=" -lppl_c -lppl -lgmpxx"
|
||||
ppllibs=
|
||||
pplinc=
|
||||
pwllib=
|
||||
|
||||
AC_ARG_WITH(ppl,
|
||||
[AS_HELP_STRING([--with-ppl=PATH],
|
||||
|
|
@ -1636,45 +1637,65 @@ AC_ARG_WITH(ppl-lib,
|
|||
[AS_HELP_STRING([--with-ppl-lib=PATH],
|
||||
[specify directory for the installed PPL library])])
|
||||
|
||||
case $with_ppl in
|
||||
no)
|
||||
ppllibs=
|
||||
;;
|
||||
"" | yes)
|
||||
;;
|
||||
*)
|
||||
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
|
||||
pplinc="-I$with_ppl/include $pplinc"
|
||||
;;
|
||||
esac
|
||||
if test "x$with_ppl_include" != x; then
|
||||
pplinc="-I$with_ppl_include $pplinc"
|
||||
fi
|
||||
if test "x$with_ppl_lib" != x; then
|
||||
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
|
||||
fi
|
||||
if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
|
||||
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"' -lppl_c -lppl -lgmpxx '
|
||||
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
|
||||
enable_ppl_version_check=no
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(ppl-version-check,
|
||||
[AS_HELP_STRING([--disable-ppl-version-check],
|
||||
[disable check for PPL version])],
|
||||
ENABLE_PPL_CHECK=$enableval,
|
||||
ENABLE_PPL_CHECK=yes)
|
||||
[disable check for PPL version])])
|
||||
|
||||
if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
|
||||
case $with_ppl in
|
||||
yes | no | "")
|
||||
;;
|
||||
*)
|
||||
ppllibs="-L$with_ppl/lib"
|
||||
pplinc="-I$with_ppl/include $pplinc"
|
||||
if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then
|
||||
with_ppl=yes
|
||||
else
|
||||
AC_MSG_ERROR([cannot find directories "$with_ppl/lib" or "$with_ppl/include"])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if test x"$with_ppl_include" != x; then
|
||||
pplinc="-I$with_ppl_include $pplinc"
|
||||
with_ppl=yes
|
||||
fi
|
||||
|
||||
if test "x$with_ppl_lib" != x; then
|
||||
ppllibs="-L$with_ppl_lib"
|
||||
with_ppl=yes
|
||||
fi
|
||||
|
||||
if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
|
||||
if test x"$enable_watchdog" = xyes; then
|
||||
pwllib="-lpwl"
|
||||
fi
|
||||
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"
|
||||
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
|
||||
enable_ppl_version_check=no
|
||||
with_ppl=yes
|
||||
fi
|
||||
|
||||
if test "x$with_ppl" = xyes; then
|
||||
if test "x$pwllib" = x; then
|
||||
saved_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS $ppllibs"
|
||||
AC_CHECK_LIB(pwl,PWL_handle_timeout,[pwllib="-lpwl"])
|
||||
LDFLAGS="$saved_LDFLAGS"
|
||||
fi
|
||||
|
||||
ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
|
||||
|
||||
if test "$enable_ppl_version_check" != no; then
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $pplinc $gmpinc"
|
||||
AC_MSG_CHECKING([for version 0.11 (or later revision) of PPL])
|
||||
AC_MSG_CHECKING([for version 0.11 (revision 0 or later) of PPL])
|
||||
AC_TRY_COMPILE([#include "ppl_c.h"],[
|
||||
#if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
|
||||
choke me
|
||||
#endif
|
||||
], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Flags needed for PPL
|
||||
|
|
|
|||
Loading…
Reference in New Issue