X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=8d0ecaf3a971fc83ea92bf577293c3b240c9ae8c;hp=e962725c8071dc28d62a44d17a8fb9d55a01c913;hb=819406cb5dd7531091d1add7f38a2daf327d4f27;hpb=97af29c12bb3074cfb4e674d71000f0712c51ba2

diff --git a/configure.in b/configure.in
index e962725c..8d0ecaf3 100644
--- a/configure.in
+++ b/configure.in
@@ -18,10 +18,10 @@ dnl autoconf sees "AC_MAJOR_VERSION" and complains about an undefined macro
 dnl (don't we all *love* M4?)...
 
 GINACLIB_MAJOR_VERSION=0
-GINACLIB_MINOR_VERSION=5
-GINACLIB_MICRO_VERSION=0
+GINACLIB_MINOR_VERSION=6
+GINACLIB_MICRO_VERSION=4
 GINACLIB_INTERFACE_AGE=0
-GINACLIB_BINARY_AGE=0
+GINACLIB_BINARY_AGE=1
 GINACLIB_VERSION=$GINACLIB_MAJOR_VERSION.$GINACLIB_MINOR_VERSION.$GINACLIB_MICRO_VERSION
 
 AC_SUBST(GINACLIB_MAJOR_VERSION)
@@ -73,11 +73,12 @@ AM_PROG_LEX
 AC_PROG_YACC
 
 dnl Configure options.
-AC_ARG_ENABLE(html-doc, [  --enable-html-doc       build HTML documentation [default=yes]], , enable_html_doc=yes)
-AC_ARG_ENABLE(ps-doc,   [  --enable-ps-doc         build PostScript documentation [default=yes]], , enable_ps_doc=yes)
+AC_ARG_ENABLE(html-doc, [  --enable-html-doc       build HTML documentation [default=no]], , enable_html_doc=no)
+AC_ARG_ENABLE(ps-doc,   [  --enable-ps-doc         build PostScript documentation [default=no]], , enable_ps_doc=no)
 AC_ARG_WITH(cint, [  --with-cint=CINTSYSDIR  build GiNaC-cint C++ interpreter [default=no]], , with_cint=no)
 
-dnl Check for data types which are needed by the hash function (golden_ratio_hash).
+dnl Check for data types which are needed by the hash function 
+dnl (golden_ratio_hash).
 AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(long long, 8)
 AC_CHECK_SIZEOF(long double, 12)
@@ -88,22 +89,25 @@ 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
+GINAC_TERMCAP
 save_LIBS=$LIBS
+LIBS="$LIBTERMCAP $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)
 
-dnl Make sure the following libraries work by testing for symbols therein. 
-dnl They are automatically added the the variable $LIBS and thus passed into
-dnl the Makefile:
-AC_CHECK_LIB(stdc++, cout)
-
 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 +132,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"
@@ -144,14 +148,10 @@ AC_SUBST(TUTORIAL_TARGETS)
 AC_SUBST(REFERENCE_TARGETS)
 
 dnl Configure GiNaC-cint
-LIBGINACCINT=
 GINACCINTDIR=
-if [[ "x$with_cint" != "xno" ]]; then
-  if [[ "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" != "xno"; 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
@@ -164,19 +164,18 @@ if [[ "x$with_cint" != "xno" ]]; then
     AC_MSG_RESULT([creating cint/Makefile])
     (cd cint && \
     $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.bin.cpp \
-      -l ./libginac.a -lcln -cint -M0x10; \
+      -D OBSCURE_CINT_HACK "$CPPFLAGS" -cc "$CXXFLAGS" \
+      -I .. -I $CINTSYSDIR -m -H ../ginac/ginac.h \
+      -C++ ginaccint.bin.cpp \
+      -l -L../ginac/.libs -lginac -lcln \
+      -cint -M0x10; \
     cd ..)
-    LIBGINACCINT="libginac.a"
     GINACCINTDIR="cint"
   else
     AC_MSG_ERROR([Cannot configure GiNaC-cint])
   fi
 fi
 AC_SUBST(CINTSYSDIR)
-AC_SUBST(LIBGINACCINT)
 AC_SUBST(GINACCINTDIR)
 
 dnl Output makefiles etc.
@@ -185,6 +184,7 @@ Makefile
 GiNaC.spec
 ginac-config
 ginac/Makefile
+ginac/version.h
 check/Makefile
 ginsh/Makefile
 tools/Makefile
@@ -192,6 +192,7 @@ doc/Makefile
 doc/tutorial/Makefile
 doc/reference/Makefile
 cint/Makefile
-cint/ginaccint
-], [chmod +x ginac-config cint/ginaccint])
-echo "Configuration done. Now type \"make\"."
+cint/launch.h
+], [chmod +x ginac-config])
+dnl Display a final warning if there has been a GINAC_ERROR or a GINAC_WARNING
+GINAC_CHECK_ERRORS