From ac3cc5bb2870064a7fecc68db452cc7b2b622538 Mon Sep 17 00:00:00 2001
From: Debian Science Maintainers
 <debian-science-maintainers@lists.alioth.debian.org>
Date: Sat, 11 Jan 2020 01:35:53 +0000
Subject: [PATCH] Improve fplll.pc

Forwarded: not yet


Gbp-Pq: Name fix_pc_file.patch
---
 configure.ac      | 6 ++----
 fplll.pc.in       | 3 ++-
 fplll/Makefile.am | 2 +-
 tests/Makefile.am | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7b3790f..8ce32b1 100644
--- 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 01b3d30..a2973d6 100644
--- 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 af9a22b..1657b44 100755
--- 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 1f11d24..d56728c 100755
--- 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
-- 
2.30.2