Improve fplll.pc

Forwarded: not yet

Gbp-Pq: Name fix_pc_file.patch

diff --git a/configure.ac b/configure.ac
index 7b3790fd625a8b7cbe899fdb460a338bbf3312af..8ce32b1ebaec30edc033a884bd543f8ade383482 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ AS_IF([test "x$enable_mpir" = "xyes"], [
        [MPIR not found, see http://mpir.org])])
        AC_CHECK_LIB(mpir, __gmp_get_memory_functions, , [AC_MSG_ERROR(
        [MPIR version too old, need >= 1.0.0, see http://mpir.org])])
-        LIBGMP="-lmpir"
+        LIBGMP="mpir"
 ])
 
 AS_IF([test "x$enable_mpir" != "xyes"], [
@@ -85,13 +85,11 @@ AS_IF([test "x$enable_mpir" != "xyes"], [
        [GNU MP not found, see http://mpir.org])])
        AC_CHECK_LIB(gmp, __gmp_get_memory_functions, , [AC_MSG_ERROR(
        [GMP version too old, need >= 4.2.0, see http://gmplib.org])])
-        LIBGMP="-lgmp"
+        LIBGMP="gmp"
 ])
 
 AC_SUBST(LIBGMP)
 
-AC_SUBST(LIBGMP)
-
 AC_ARG_WITH(mpfr,
    AS_HELP_STRING([--with-mpfr=@<:@=DIR@:>@], [MPFR install directory]), [
       CPPFLAGS="$CPPFLAGS -I$withval/include"

diff --git a/fplll.pc.in b/fplll.pc.in
index 01b3d306833202df78ba17e1a5855c9de9073c5a..a2973d615257d04df2fed1cb63edd9f2da6877b1 100644 (file)
--- a/fplll.pc.in
+++ b/fplll.pc.in
@@ -7,4 +7,5 @@ Name: @PACKAGE_NAME@
 Description: lattice algorithms with floating-point computations
 Version: @PACKAGE_VERSION@
 Cflags: @PTHREAD_CFLAGS@
-Libs: -L${libdir} @LIBQD_LIBADD@ @LIBGMP@ @PTHREAD_LIBS@ -lmpfr -lfplll
+Requires: @LIBGMP@, mpfr
+Libs: -L${libdir} @LIBQD_LIBADD@ -lfplll

diff --git a/fplll/Makefile.am b/fplll/Makefile.am
index af9a22bd0a79c16b9252d8370b787bd356f0d7ec..1657b44854d5b34e16e600e1c8b070d0f8431608 100755 (executable)
--- a/fplll/Makefile.am
+++ b/fplll/Makefile.am
@@ -107,7 +107,7 @@ libfplll_la_SOURCES=fplll.cpp fplll.h \
 libfplll_la_CXXFLAGS=$(PTHREAD_CFLAGS)
 
 EXTRA_libfplll_la_SOURCES= svpcvp.cpp
-libfplll_la_LIBADD=$(LIBGMP) -lmpfr $(LIBQD_LIBADD) $(PTHREAD_LIBS)
+libfplll_la_LIBADD=-l$(LIBGMP) -lmpfr $(LIBQD_LIBADD) $(PTHREAD_LIBS)
 libfplll_la_LDFLAGS=-no-undefined -version-info @FPLLL_LT_CURRENT@:@FPLLL_LT_REVISION@:@FPLLL_LT_AGE@ $(PTHREAD_CFLAGS)
 
 if FPLLL_PARALLEL_ENUM

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1f11d2460293fd46482a67d7471b870adc6c5db6..d56728c14ad081fa86e5df932c06f40fe79182c7 100755 (executable)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,8 +44,8 @@ AM_LDFLAGS = -L$(STAGEDIR) -Wl,-rpath,$(STAGEDIR) -lfplll -no-install $(LIBQD_LI
 
 TESTS = test_nr test_lll test_enum test_cvp test_svp test_bkz test_pruner test_sieve test_gso test_lll_gram test_hlll test_svp_gram test_bkz_gram
 
-test_pruner_LDADD=$(LIBGMP) -lmpfr $(LIBQD_LIBADD)
-test_sieve_LDADD=$(LIBGMP) -lmpfr $(LIBQD_LIBADD)
+test_pruner_LDADD=-l$(LIBGMP) -lmpfr $(LIBQD_LIBADD)
+test_sieve_LDADD=-l$(LIBGMP) -lmpfr $(LIBQD_LIBADD)
 
 test_nr_SOURCES = test_nr.cpp
 test_lll_SOURCES = test_lll.cpp