mirror of
https://github.com/fail0verflow/bootmii-utils.git
synced 2025-01-23 15:31:23 +01:00
55 lines
2.5 KiB
Diff
55 lines
2.5 KiB
Diff
|
--- old-configure 2010-07-11 15:10:39.470057633 +0200
|
||
|
|
+++ configure 2010-07-11 15:13:36.892556492 +0200
|
||
|
|
@@ -4492,7 +4492,12 @@
|
||
|
|
echo "${ECHO_T}$gcc_cv_prog_cmp_skip" >&6
|
||
|
|
do_compare="$gcc_cv_prog_cmp_skip"
|
||
|
|
|
||
|
|
+lt_cv_objdir=.libs
|
||
|
|
+objdir=$lt_cv_objdir
|
||
|
|
|
||
|
|
+cat >>confdefs.h <<_ACEOF
|
||
|
|
+#define LT_OBJDIR "$lt_cv_objdir/"
|
||
|
|
+_ACEOF
|
||
|
|
|
||
|
|
# Check for GMP and MPFR
|
||
|
|
gmplibs="-lmpfr -lgmp"
|
||
|
|
@@ -4542,7 +4547,7 @@
|
||
|
|
gmplibs="-L$with_mpfr_lib $gmplibs"
|
||
|
|
fi
|
||
|
|
if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
|
||
|
|
- gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs"
|
||
|
|
+ gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
|
||
|
|
gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
|
||
|
|
# Do not test the mpfr version. Assume that it is sufficient, since
|
||
|
|
# it is in the source tree, and the library has not been built yet
|
||
|
|
@@ -4594,9 +4599,9 @@
|
||
|
|
gmplibs="-L$with_gmp_lib $gmplibs"
|
||
|
|
fi
|
||
|
|
if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
|
||
|
|
- gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
|
||
|
|
+ gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
|
||
|
|
gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
|
||
|
|
- extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
|
||
|
|
+ extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
|
||
|
|
# Do not test the gmp version. Assume that it is sufficient, since
|
||
|
|
# it is in the source tree, and the library has not been built yet
|
||
|
|
# but it would be included on the link line in the version check below
|
||
|
|
@@ -4871,7 +4876,7 @@
|
||
|
|
LIBS="$ppllibs $LIBS"
|
||
|
|
fi
|
||
|
|
if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
|
||
|
|
- ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx "
|
||
|
|
+ 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/include -I$$s/ppl/include '
|
||
|
|
LIBS="$ppllibs $LIBS"
|
||
|
|
fi
|
||
|
|
@@ -4990,7 +4995,7 @@
|
||
|
|
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 '
|
||
|
|
+ clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' -lcloog '
|
||
|
|
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND '
|
||
|
|
LIBS="$clooglibs $LIBS"
|
||
|
|
fi
|