X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=40118f716562d8fbc7e5919a9dac4884bf20a71e;hp=9249f9da7809a17d830ddb69e572cb3311452491;hb=5184d67c0ec1056ac039419e08558632793a4e2c;hpb=956eeb82c513a723e864edefa857133282cf692b

diff --git a/configure.in b/configure.in
index 9249f9da..40118f71 100644
--- 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)
@@ -88,8 +88,14 @@ 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)
+if test "x${ac_cv_header_readline_readline_h}" != "xyes" -o "x${ac_cv_header_readline_history_h}" != "xyes"; then
+  GINAC_WARNING([I could not find the headers for libreadline (needed for building ginsh).])
+fi
 save_LIBS=$LIBS
 AC_CHECK_LIB(readline, readline)
+if test "x${ac_cv_lib_readline_readline}" != "xyes"; then
+  GINAC_WARNING([I could not find libreadline (needed by ginsh).])
+fi
 GINSH_LIBS=$LIBS
 LIBS=$save_LIBS
 AC_SUBST(GINSH_LIBS)
@@ -103,7 +109,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):
@@ -128,13 +134,13 @@ AC_PATH_PROG(FIG2DEV, fig2dev, "")
 dnl Determine which documentation shall be built
 TUTORIAL_TARGETS=
 REFERENCE_TARGETS=
-if [[ "x$enable_html_doc" = "xyes" ]]; then
+if test "x${enable_html_doc}" = "xyes"; then
   TUTORIAL_TARGETS="$TUTORIAL_TARGETS ginac.html"
   if [[ "$DOXYGEN" ]]; then
     REFERENCE_TARGETS="$REFERENCE_TARGETS index.html"
   fi
 fi
-if [[ "x$enable_ps_doc" = "xyes" ]]; then
+if test "x${enable_ps_doc}" = "xyes"; then
   TUTORIAL_TARGETS="$TUTORIAL_TARGETS ginac.ps"
   if [[ "$DOXYGEN" ]]; then
     REFERENCE_TARGETS="$REFERENCE_TARGETS reference.ps"
@@ -146,12 +152,12 @@ AC_SUBST(REFERENCE_TARGETS)
 dnl Configure GiNaC-cint
 LIBGINACCINT=
 GINACCINTDIR=
-if [[ "x$with_cint" != "xno" ]]; then
-  if [[ "x$enable_static" != "xyes" ]]; then
+if test "x$with_cint" != "xno"; then
+  if test "x$enable_static" != "xyes"; then
     AC_MSG_ERROR([currently GiNaC-cint needs to build a static libginac])
   fi
-  if [[ "x$with_cint" = "xyes" ]]; then
-    if [[ "x$CINTSYSDIR" = "x" ]]; then
+  if test "x$with_cint" = "xyes"; then
+    if test "x$CINTSYSDIR" = "x"; then
       AC_MSG_ERROR([please export \$CINTSYSDIR or specify --with-cint=CINTSYSDIR])
     fi
   else
@@ -163,10 +169,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 \
-      -D OBSCURE_CINT_HACK -D NO_NAMESPACE_GINAC \
+    $MAKECINT -mk Makefile.makecint -o ginaccint.bin -m \
+      -D OBSCURE_CINT_HACK -D CINT_CONVERSION_WORKAROUND -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 +181,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 +198,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