- Made configure warn a lot when readline-stuff couldn't be found.

[ginac.git] / configure.in

diff --git a/configure.in b/configure.in
index 9249f9da7809a17d830ddb69e572cb3311452491..be24b7ec14ae10e00432c89817f45a857b977bd6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,9 +19,9 @@ dnl (don't we all *love* M4?)...
 
 GINACLIB_MAJOR_VERSION=0
 GINACLIB_MINOR_VERSION=5
-GINACLIB_MICRO_VERSION=0
-GINACLIB_INTERFACE_AGE=0
-GINACLIB_BINARY_AGE=0
+GINACLIB_MICRO_VERSION=2
+GINACLIB_INTERFACE_AGE=2
+GINACLIB_BINARY_AGE=2
 GINACLIB_VERSION=$GINACLIB_MAJOR_VERSION.$GINACLIB_MINOR_VERSION.$GINACLIB_MICRO_VERSION
 
 AC_SUBST(GINACLIB_MAJOR_VERSION)
@@ -87,9 +87,13 @@ AC_LANG_CPLUSPLUS
 
 dnl Check for stuff needed for building the GiNaC interactive shell (ginsh).
 AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+AC_CHECK_HEADER(readline/readline.h, ,
+  GINAC_WARNING([I could not find the header file readline/readline.h (needed for ginsh).]))
+AC_CHECK_HEADER(readline/history.h, ,
+  GINAC_WARNING([I could not find the header file readline/history.h (needed for ginsh).]))
 save_LIBS=$LIBS
-AC_CHECK_LIB(readline, readline)
+AC_CHECK_LIB(readline, readline, ,
+  GINAC_WARNING([I could not find libreadline (needed by ginsh).]))
 GINSH_LIBS=$LIBS
 LIBS=$save_LIBS
 AC_SUBST(GINSH_LIBS)
@@ -103,7 +107,7 @@ dnl Make sure all the necessary new-style headers are installed on the system.
 dnl If one of them cannot be found the system is probably not ANSI-conform
 dnl enough so trying the .h-style headers is a waste of time.
 AC_CHECK_HEADERS(iostream vector map string list typeinfo iterator stdexcept algorithm, ,
-    AC_MSG_ERROR(need to have ANSI compliant headers))
+  AC_MSG_ERROR(need to have ANSI compliant headers))
 AC_CHECK_HEADERS(sstream strstream)
 
 dnl We need to have Bruno Haible's CLN installed (macros are in acinclude.m4):
@@ -163,10 +167,10 @@ if [[ "x$with_cint" != "xno" ]]; then
   if [[ "$CINT" -a "$MAKECINT" ]]; then
     AC_MSG_RESULT([creating cint/Makefile])
     (cd cint && \
-    $MAKECINT -mk Makefile.makecint -o ginaccint -m \
+    $MAKECINT -mk Makefile.makecint -o ginaccint.bin -m \
       -D OBSCURE_CINT_HACK -D NO_NAMESPACE_GINAC \
       -I .. -I $CINTSYSDIR -m -H ../ginac/ginac.h dummies.h \
-      -C++ dummies.cpp -C++ ginaccint.cpp \
+      -C++ dummies.cpp -C++ ginaccint.bin.cpp \
       -l ./libginac.a -lcln -cint -M0x10; \
     cd ..)
     LIBGINACCINT="libginac.a"
@@ -175,6 +179,7 @@ if [[ "x$with_cint" != "xno" ]]; then
     AC_MSG_ERROR([Cannot configure GiNaC-cint])
   fi
 fi
+AC_SUBST(CINTSYSDIR)
 AC_SUBST(LIBGINACCINT)
 AC_SUBST(GINACCINTDIR)
 
@@ -191,5 +196,7 @@ doc/Makefile
 doc/tutorial/Makefile
 doc/reference/Makefile
 cint/Makefile
-], [chmod +x ginac-config])
-echo "Configuration done. Now type \"make\"."
+cint/ginaccint
+], [chmod +x ginac-config cint/ginaccint])
+dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING
+GINAC_CHECK_ERRORS