X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=a1a3903d80aee26eca4f83c8cf9ee42009905ac7;hp=066d4f2eac782108ff0ea008b1637c926145dfcd;hb=4fb81453461f004b7334bac10d1eed60ac9837b8;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd

diff --git a/configure.in b/configure.in
index 066d4f2e..a1a3903d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(ginac/basic.cpp)
-AC_PREREQ(2.12)
+AC_PREREQ(2.13)
 
 dnl Configure options
 AC_ARG_ENABLE(html-doc, [  --enable-help-doc       build HTML documentation [default=yes]], , enable_html_doc=yes)
-AC_ARG_ENABLE(ps-doc,   [  --enable-ps-doc         build PostScript documentation [default=no]], , enable_ps_doc=no)
+AC_ARG_ENABLE(ps-doc,   [  --enable-ps-doc         build PostScript documentation [default=yes]], , enable_ps_doc=yes)
 
 dnl GiNaC version information
 dnl
@@ -56,14 +56,28 @@ dnl Check for the compiler and all the utilities needed for the build:
 dnl ===========================================================================
 AC_PROG_CXX
 AC_PROG_CXXCPP
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AM_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
 
+dnl Check for data types which are needed by the hash function (golden_ratio_hash)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(long long, 8)
+AC_CHECK_SIZEOF(long double, 12)
+
 dnl Switch to C++ language mode for the following libraries and headers:
 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)
+save_LIBS=$LIBS
+AC_CHECK_LIB(readline, readline)
+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:
@@ -75,11 +89,6 @@ dnl enough so trying the .h-style headers is a waste of time.
 AC_CHECK_HEADERS(iostream vector map string list typeinfo iterator strstream stdexcept algorithm, ,
     AC_MSG_ERROR(need to have ANSI compliant headers))
 
-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_LIB(readline, readline)
-
 dnl We need to have Bruno Haible's CLN installed (macros are in acinclude.m4):
 GINAC_CHECK_CLN_H
 GINAC_CHECK_LIBCLN
@@ -88,8 +97,6 @@ dnl Check for utilities needed by the different kinds of documentation.
 dnl Documantation needs only be built when extending it, so never mind if it
 dnl cannot find those helpers:
 AC_PATH_PROG(DOXYGEN, doxygen, "")
-AC_PATH_PROG(JADE, jade, "")
-AC_PATH_PROG(JADETEX, jadetex, "")
 AC_PATH_PROG(LATEX, latex, "")
 AC_PATH_PROG(MAKEINDEX, makeindex, "")
 AC_PATH_PROG(DVIPS, dvips, "")
@@ -99,13 +106,16 @@ dnl Determine which documentation shall be built
 TUTORIAL_TARGETS=
 REFERENCE_TARGETS=
 if [[ "x$enable_html_doc" = "xyes" ]]; then
-  TUTORIAL_TARGETS="$TUTORIAL_TARGETS index.html"
-  REFERENCE_TARGETS="$REFERENCE_TARGETS index.html"
+  TUTORIAL_TARGETS="$TUTORIAL_TARGETS ginac.html"
+  if [[ "$DOXYGEN" ]]; then
+    REFERENCE_TARGETS="$REFERENCE_TARGETS index.html"
+  fi
 fi
 if [[ "x$enable_ps_doc" = "xyes" ]]; then
-# currently doesn't work
-#  TUTORIAL_TARGETS="$TUTORIAL_TARGETS tutorial.ps"
-  REFERENCE_TARGETS="$REFERENCE_TARGETS reference.ps"
+  TUTORIAL_TARGETS="$TUTORIAL_TARGETS ginac.ps"
+  if [[ "$DOXYGEN" ]]; then
+    REFERENCE_TARGETS="$REFERENCE_TARGETS reference.ps"
+  fi
 fi
 AC_SUBST(TUTORIAL_TARGETS)
 AC_SUBST(REFERENCE_TARGETS)