X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=configure.in;h=f1212483a0b0b7e95cd52172571861787c589bd5;hp=2964758d2431d333fd4318e2fb9c918ee95b9f79;hb=9f1ed9ec58a11de2f11f904878c6727549678a91;hpb=e29584838dc377a2c2b00731a0ffdbdc3425f214 diff --git a/configure.in b/configure.in index 2964758d..f1212483 100644 --- a/configure.in +++ b/configure.in @@ -19,9 +19,9 @@ 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_MICRO_VERSION=1 +GINACLIB_INTERFACE_AGE=1 +GINACLIB_BINARY_AGE=1 GINACLIB_VERSION=$GINACLIB_MAJOR_VERSION.$GINACLIB_MINOR_VERSION.$GINACLIB_MICRO_VERSION AC_SUBST(GINACLIB_MAJOR_VERSION) @@ -77,7 +77,8 @@ AC_ARG_ENABLE(html-doc, [ --enable-html-doc build HTML documentation [def 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 +103,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. @@ -154,9 +150,6 @@ AC_SUBST(REFERENCE_TARGETS) dnl Configure GiNaC-cint 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]) @@ -171,7 +164,7 @@ 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 OBSCURE_CINT_HACK "$CPPFLAGS" -cc "$CXXFLAGS" \ -I .. -I $CINTSYSDIR -m -H ../ginac/ginac.h \ -C++ ginaccint.bin.cpp \ -l -L../ginac/.libs -lginac -lcln \