Merge branch 'u/dimpase/packages/mpc-config' of trac.sagemath.org:sag…

…e into mpf

build/pkgs/gdb/spkg-install

@@ -4,7 +4,7 @@ cd src
 export LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib -ltinfo"
 
 sdh_configure \
-    --with-mpc="$SAGE_LOCAL" \
+    --with-mpc="$SAGE_MPC_PREFIX" \
     $SAGE_CONFIGURE_MPFR \
     $SAGE_CONFIGURE_GMP
 sdh_make

build/pkgs/mpc/spkg-configure.m4

@@ -0,0 +1,24 @@
+SAGE_SPKG_CONFIGURE([mpc], [
+    AC_CHECK_HEADER(mpc.h, [], [sage_spkg_install_mpc=yes])
+dnl mpc_cmp_abs appeared in MPC 1.1.0
+    AC_SEARCH_LIBS([mpc_cmp_abs], [mpc], [break], [sage_spkg_install_mpc=yes])
+
+    if test x$sage_spkg_install_mpc = xyes; then
+        AC_SUBST(SAGE_MPC_PREFIX, ['$SAGE_LOCAL'])
+        dnl AC_SUBST(SAGE_MPC_INCLUDE, ['$SAGE_LOCAL/include'])
+        AC_MSG_RESULT([using Sage's mpc SPKG])
+    else
+        dnl If found, we want to get the absolute path to where we
+        dnl found it for use with some packages want
+        dnl this information at configure time
+        AX_ABSOLUTE_HEADER([mpc.h])
+        if test x$gl_cv_absolute_mpc_h = x; then
+            AC_MSG_ERROR(m4_normalize([
+                failed to find absolute path to mpc.h despite it being reported found
+            ]))
+        fi
+        dnl AC_SUBST(SAGE_MPC_INCLUDE, [`AS_DIRNAME($gl_cv_absolute_mpc_h)`])
+        AC_SUBST(SAGE_MPC_PREFIX, [''])
+        AC_MSG_RESULT([using mpc library from the system])
+    fi
+])

build/pkgs/mpfrcx/spkg-install

@@ -1,6 +1,6 @@
 cd src
 
-sdh_configure $SAGE_CONFIGURE_GMP $SAGE_CONFIGURE_MPFR \
-              --with-mpc="$SAGE_LOCAL" --disable-static --enable-shared
+sdh_configure $SAGE_CONFIGURE_GMP $SAGE_CONFIGURE_MPFR \ 
+              --with-mpc="$SAGE_MPC_PREFIX" --disable-static --enable-shared
 sdh_make
 sdh_make_install