- Changed policy: look for cln/cln.h instead of CLN/cln.h, reflecting an

  agreement with Bruno Haible.

diff --git a/acinclude.m4 b/acinclude.m4
index 1f621f98dbfbba2b6fe1202da2caaf4e2b0f9890..2c743d7b894f6e84d7ca6fdfe4830d0909350155 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -8,12 +8,12 @@ dnl Generally, it is a bad idea to put specialized header files for a library
 dnl into a generic directory like /usr/local/include/.  Instead, one should put
 dnl them into a subdirectory.  GiNaC does it, NTL does it.  Unfortunately, CLN
 dnl doesn't do so but some people choose to do it by hand.  In these cases we
-dnl need to #include <CLN/cln.h>, otherwise #include <cln.h>.  This macro
+dnl need to #include <cln/cln.h>, otherwise #include <cln.h>.  This macro
 dnl tries to be clever and find out the correct way by defining the variable
 dnl HAVE_CLN_CLN_H in config.h:
 AC_DEFUN(GINAC_CHECK_CLN_H,
     [AC_PROVIDE([$0])
-    AC_CHECK_HEADERS(CLN/cln.h, ,
+    AC_CHECK_HEADERS(cln/cln.h, ,
         AC_CHECK_HEADERS(cln.h, ,
             AC_MSG_ERROR([cannot find header for Bruno Haible's CLN]);
         )
@@ -31,7 +31,7 @@ AC_DEFUN(GINAC_CHECK_LIBCLN,
         [LIBS="-lcln"
         case "${ac_cv_header_CLN_cln_h}" in
         "yes")
-            AC_TRY_LINK([#include <CLN/cln.h>],
+            AC_TRY_LINK([#include <cln/cln.h>],
                 [factorial(1);],
                 ginac_cv_lib_cln_link="-lcln",
                 ginac_cv_lib_cln_link="fail")
@@ -74,7 +74,7 @@ AC_DEFUN(GINAC_CHECK_LIBCLN_SANITY,
         [
         case "${ac_cv_header_CLN_cln_h}" in
         "yes")
-            AC_TRY_RUN([#include <CLN/cln.h>
+            AC_TRY_RUN([#include <cln/cln.h>
 int main() {
 cl_RA q(3); q = q/2; cl_RA p(3); p = p/2;
 if (q+p != 3) return 1; else return 0;

diff --git a/aclocal.m4 b/aclocal.m4
index 87d8492d5fa5f4f3d92eb06cdd47715cd62731e4..a82589df1236d5f9abdd50e64acba47e7b3f4c0f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,12 +20,12 @@ dnl Generally, it is a bad idea to put specialized header files for a library
 dnl into a generic directory like /usr/local/include/.  Instead, one should put
 dnl them into a subdirectory.  GiNaC does it, NTL does it.  Unfortunately, CLN
 dnl doesn't do so but some people choose to do it by hand.  In these cases we
-dnl need to #include <CLN/cln.h>, otherwise #include <cln.h>.  This macro
+dnl need to #include <cln/cln.h>, otherwise #include <cln.h>.  This macro
 dnl tries to be clever and find out the correct way by defining the variable
 dnl HAVE_CLN_CLN_H in config.h:
 AC_DEFUN(GINAC_CHECK_CLN_H,
     [AC_PROVIDE([$0])
-    AC_CHECK_HEADERS(CLN/cln.h, ,
+    AC_CHECK_HEADERS(cln/cln.h, ,
         AC_CHECK_HEADERS(cln.h, ,
             AC_MSG_ERROR([cannot find header for Bruno Haible's CLN]);
         )
@@ -43,7 +43,7 @@ AC_DEFUN(GINAC_CHECK_LIBCLN,
         [LIBS="-lcln"
         case "${ac_cv_header_CLN_cln_h}" in
         "yes")
-            AC_TRY_LINK([#include <CLN/cln.h>],
+            AC_TRY_LINK([#include <cln/cln.h>],
                 [factorial(1);],
                 ginac_cv_lib_cln_link="-lcln",
                 ginac_cv_lib_cln_link="fail")
@@ -86,7 +86,7 @@ AC_DEFUN(GINAC_CHECK_LIBCLN_SANITY,
         [
         case "${ac_cv_header_CLN_cln_h}" in
         "yes")
-            AC_TRY_RUN([#include <CLN/cln.h>
+            AC_TRY_RUN([#include <cln/cln.h>
 int main() {
 cl_RA q(3); q = q/2; cl_RA p(3); p = p/2;
 if (q+p != 3) return 1; else return 0;

diff --git a/config.h.in b/config.h.in
index b2c1b2443e63ac13f0d6aedc7257849b171da78b..c229c73a80acb00aaadb9f9e11e356abc7d4d201 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -18,12 +18,12 @@
 /* The number of bytes in a long long.  */
 #undef SIZEOF_LONG_LONG
 
-/* Define if you have the <CLN/cln.h> header file.  */
-#undef HAVE_CLN_CLN_H
-
 /* Define if you have the <algorithm> header file.  */
 #undef HAVE_ALGORITHM
 
+/* Define if you have the <cln/cln.h> header file.  */
+#undef HAVE_CLN_CLN_H
+
 /* Define if you have the <iostream> header file.  */
 #undef HAVE_IOSTREAM
 

diff --git a/configure b/configure
index 62541f3b61b507e8087be6fc811f59ff7ac7273a..d2e6a6cd8d7c32a4075cd95e1fe768c3c48537b4 100755 (executable)
--- a/configure
+++ b/configure
@@ -2446,7 +2446,7 @@ done
 
 
 
-    for ac_hdr in CLN/cln.h
+    for ac_hdr in cln/cln.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2543,7 +2543,7 @@ else
             cat > conftest.$ac_ext <<EOF
 #line 2545 "configure"
 #include "confdefs.h"
-#include <CLN/cln.h>
+#include <cln/cln.h>
 int main() {
 factorial(1);
 ; return 0; }
@@ -2605,7 +2605,7 @@ else
 #ifdef __cplusplus
 extern "C" void exit(int);
 #endif
-#include <CLN/cln.h>
+#include <cln/cln.h>
 int main() {
 cl_RA q(3); q = q/2; cl_RA p(3); p = p/2;
 if (q+p != 3) return 1; else return 0;