X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=8e10c5a2f45c76ae786cd819067dff75c139e5d2;hp=44ab9031101a2334c3554363e30d933bc7f7a9d5;hb=3b977d948fc46a88dc5145757bf46ab40b7af44e;hpb=3ecae1b0cd75b32bec423fa8cca5626f7790ab42

diff --git a/configure.in b/configure.in
index 44ab9031..8e10c5a2 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(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)
 
 dnl GiNaC version information
 dnl
@@ -23,9 +23,9 @@ dnl (don't we all *love* autoconf?)...
 
 GINACLIB_MAJOR_VERSION=0
 GINACLIB_MINOR_VERSION=4
-GINACLIB_MICRO_VERSION=0
+GINACLIB_MICRO_VERSION=1
 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)
@@ -56,11 +56,16 @@ 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
 
@@ -88,12 +93,16 @@ dnl We need to have Bruno Haible's CLN installed (macros are in acinclude.m4):
 GINAC_CHECK_CLN_H
 GINAC_CHECK_LIBCLN
 
+dnl Expand the cppflags and libraries needed by apps using GiNaC
+GINACLIB_CPPFLAGS=$CPPFLAGS
+GINACLIB_LIBS=$LIBS
+AC_SUBST(GINACLIB_CPPFLAGS)
+AC_SUBST(GINACLIB_LIBS)
+
 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, "")
@@ -103,28 +112,30 @@ 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)
 
-dnl ===========================================================================
-dnl Produce a Makefile from Makefile.in:
-dnl ===========================================================================
+dnl Output makefiles etc.
 AC_OUTPUT([
 Makefile
 GiNaC.spec
+ginac-config
 ginac/Makefile
 check/Makefile
 ginsh/Makefile
 doc/Makefile
 doc/tutorial/Makefile
 doc/reference/Makefile
-])
+], [chmod +x ginac-config])
 echo "Configuration done. Now type \"make\"."