Patchwork mpfr headers check

login
register
mail settings
Submitter JonY
Date March 22, 2012, 1:48 p.m.
Message ID <4F6B2DBB.40200@users.sourceforge.net>
Download mbox | patch
Permalink /patch/148253/
State New
Headers show

Comments

JonY - March 22, 2012, 1:48 p.m.
Hi,

Attached is a rebased copy of a patch from
<http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51935>.

This is mostly a ping reminder.

Patch

Index: configure.ac
===================================================================
--- configure.ac	(revision 185692)
+++ configure.ac	(working copy)
@@ -1271,10 +1271,12 @@ 
 if test "x$with_mpfr_lib" != x; then
   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/'"$lt_cv_objdir $gmplibs"
-  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
-  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
+if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d "${srcdir}/mpfr"; then
+  sdir=
+  test -d "${srcdir}/mpfr/src" && sdir=/src
+  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"$sdir "'-I$$s/mpfr'"$sdir $gmpinc"
+  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr'"$sdir "'--with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir"
   # 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
   # but it would be included on the link line in the version check below