X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=9849a68e8097b3fa664903ea891156f9a313f0af;hp=b85299bcdd3167ff8d404221778ee2ed0ea457f3;hb=c84d42371ab2e0cc6350a7cffd4f784a54dbd91b;hpb=5777c252a4ba89751658f58a746014e507c19f8b

diff --git a/configure.in b/configure.in
index b85299bc..9849a68e 100644
--- a/configure.in
+++ b/configure.in
@@ -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,21 +89,14 @@ 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 We need to have Bruno Haible's CLN installed (macros are in aclocal.m4):
+dnl We need to have Bruno Haible's CLN installed (macros are in acinclude.m4):
 GINAC_CHECK_CLN_H
 GINAC_CHECK_LIBCLN
 
-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 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,12 +106,11 @@ dnl Determine which documentation shall be built
 TUTORIAL_TARGETS=
 REFERENCE_TARGETS=
 if [[ "x$enable_html_doc" = "xyes" ]]; then
-  TUTORIAL_TARGETS="$TUTORIAL_TARGETS index.html"
+  TUTORIAL_TARGETS="$TUTORIAL_TARGETS ginac.html"
   REFERENCE_TARGETS="$REFERENCE_TARGETS index.html"
 fi
 if [[ "x$enable_ps_doc" = "xyes" ]]; then
-# currently doesn't work
-#  TUTORIAL_TARGETS="$TUTORIAL_TARGETS tutorial.ps"
+  TUTORIAL_TARGETS="$TUTORIAL_TARGETS ginac.ps"
   REFERENCE_TARGETS="$REFERENCE_TARGETS reference.ps"
 fi
 AC_SUBST(TUTORIAL_TARGETS)
@@ -113,5 +119,14 @@ AC_SUBST(REFERENCE_TARGETS)
 dnl ===========================================================================
 dnl Produce a Makefile from Makefile.in:
 dnl ===========================================================================
-AC_OUTPUT([Makefile ginac/Makefile check/Makefile ginsh/Makefile doc/Makefile doc/tutorial/Makefile doc/reference/Makefile])
+AC_OUTPUT([
+Makefile
+GiNaC.spec
+ginac/Makefile
+check/Makefile
+ginsh/Makefile
+doc/Makefile
+doc/tutorial/Makefile
+doc/reference/Makefile
+])
 echo "Configuration done. Now type \"make\"."