summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpelissip <pelissip@280ebfd0-de03-0410-8827-d642c229c3f4>2004-09-17 09:49:50 +0000
committerpelissip <pelissip@280ebfd0-de03-0410-8827-d642c229c3f4>2004-09-17 09:49:50 +0000
commitc02843576a43ac54604a6b91f6eea35b90dbbfdf (patch)
treea2f166373cb8ed65b5b7816c6512b2ec115fb468
parentaf50a8dd44b226acff3bf831b92e9ce010cc6739 (diff)
downloadmpfr-c02843576a43ac54604a6b91f6eea35b90dbbfdf.tar.gz
Use LIBS instead of LDADD for libraries (GMP).
git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@2973 280ebfd0-de03-0410-8827-d642c229c3f4
-rw-r--r--acinclude.m44
-rw-r--r--configure.in2
-rw-r--r--tests/Makefile.am2
3 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 02435dbbe..952e2256b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -34,11 +34,11 @@ then
AC_MSG_CHECKING($2 library)
if test -r "$1/lib$2.a"
then
- LDADD="$LDADD $1/lib$2.a"
+ LIBS="$LIBS $1/lib$2.a"
else
if test -r "$1/lib$2.so"
then
- LDADD="$LDADD $1/lib$2.so"
+ LIBS="$LIBS $1/lib$2.so"
else
AC_MSG_ERROR($1/lib$2.a/so not found)
fi
diff --git a/configure.in b/configure.in
index 92681c06c..905afdafe 100644
--- a/configure.in
+++ b/configure.in
@@ -154,7 +154,7 @@ int main()
char buffer[100];
sprintf (buffer, "%d.%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR,
__GNU_MP_VERSION_PATCHLEVEL);
- return strcmp (buffer, gmp_version);
+ return (strcmp (buffer, gmp_version) != 0) ? 1 : 0;
}
], AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d68ecf8eb..6db652bdf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ check_PROGRAMS = tversion tinits tsgn tcheck tisnan texceptions tset_exp tset ta
EXTRA_DIST = tgeneric.c mpf_compat.h inp_str.data
-LDADD = libfrtests.a $(MPFR_LIBM) $(top_builddir)/libmpfr.a @LDADD@
+LDADD = libfrtests.a $(MPFR_LIBM) $(top_builddir)/libmpfr.a
INCLUDES = -I$(top_srcdir) @INCLUDES@
check_LIBRARIES = libfrtests.a