building in separate directory didn't work

[ginac.git] / configure.in

diff --git a/configure.in b/configure.in
index 80330af8e759544e3136512521516589c276a8ba..dd4b32c035ba4acf8b0451c65c1b13640b37fe77 100644 (file)
--- 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=6
-GINACLIB_MICRO_VERSION=0
-GINACLIB_INTERFACE_AGE=0
-GINACLIB_BINARY_AGE=0
+GINACLIB_MINOR_VERSION=7
+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)
@@ -62,7 +62,6 @@ AC_SUBST(LT_AGE)
 dnl This defines PACKAGE and VERSION.
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([GiNaC], $GINACLIB_VERSION)
-AM_MAINTAINER_MODE
 
 dnl Check for the compiler and all the utilities needed for the build.
 AC_PROG_CXX
@@ -75,9 +74,9 @@ AC_PROG_YACC
 dnl Configure options.
 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)
@@ -102,11 +101,6 @@ 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.
@@ -114,9 +108,13 @@ AC_CHECK_HEADERS(iostream vector map string list typeinfo iterator stdexcept alg
   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):
-GINAC_CHECK_CLN_H
-GINAC_CHECK_LIBCLN
+dnl We need to have Bruno Haible's CLN installed.
+dnl (CLN versions >= 1.1.0 must have installed cln.m4 at a visible place,
+dnl which provides this macro):
+AC_PATH_CLN(1.1.0, [
+  LIBS="$LIBS $CLN_LIBS"
+  CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
+], GINAC_ERROR([No suitable installed version of CLN could be found.]))
 
 dnl Expand the cppflags and libraries needed by apps using GiNaC
 GINACLIB_CPPFLAGS=$CPPFLAGS
@@ -152,12 +150,9 @@ AC_SUBST(TUTORIAL_TARGETS)
 AC_SUBST(REFERENCE_TARGETS)
 
 dnl Configure GiNaC-cint
-LIBGINACCINT=
+AC_ARG_WITH(cint, [  --with-cint=CINTSYSDIR  build GiNaC-cint C++ interpreter [default=no]], , with_cint=no)
 GINACCINTDIR=
 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 test "x$with_cint" = "xyes"; then
     if test "x$CINTSYSDIR" = "x"; then
       AC_MSG_ERROR([please export \$CINTSYSDIR or specify --with-cint=CINTSYSDIR])
@@ -172,19 +167,18 @@ if test "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 CINT_CONVERSION_WORKAROUND -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 -M0x110; \
     cd ..)
-    LIBGINACCINT="libginac.a"
     GINACCINTDIR="cint"
   else
-    AC_MSG_ERROR([Cannot configure GiNaC-cint])
+    GINAC_WARNING([I could not find cint and makecint (needed for building GiNaC-cint).])
   fi
 fi
 AC_SUBST(CINTSYSDIR)
-AC_SUBST(LIBGINACCINT)
 AC_SUBST(GINACCINTDIR)
 
 dnl Output makefiles etc.
@@ -192,16 +186,19 @@ AC_OUTPUT([
 Makefile
 GiNaC.spec
 ginac-config
+ginac-config.1
 ginac/Makefile
 ginac/version.h
 check/Makefile
 ginsh/Makefile
+ginsh/ginsh.1
 tools/Makefile
+tools/viewgar.1
 doc/Makefile
 doc/tutorial/Makefile
 doc/reference/Makefile
 cint/Makefile
-cint/ginaccint
-], [chmod +x ginac-config cint/ginaccint])
+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