- Adjusted build-environment for "Cint without crutches" (tm).

[ginac.git] / configure

diff --git a/configure b/configure
index ecd447e902fabc0edf195a1cdfb2604a329758c7..c772faa44ea8ae90da41523e061b7e3e76b1d9b3 100755 (executable)
--- a/configure
+++ b/configure
@@ -25,9 +25,9 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
 ac_help="$ac_help
-  --enable-html-doc       build HTML documentation [default=yes]"
+  --enable-html-doc       build HTML documentation [default=no]"
 ac_help="$ac_help
-  --enable-ps-doc         build PostScript documentation [default=yes]"
+  --enable-ps-doc         build PostScript documentation [default=no]"
 ac_help="$ac_help
   --with-cint=CINTSYSDIR  build GiNaC-cint C++ interpreter [default=no]"
 
@@ -2084,7 +2084,7 @@ if test "${enable_html_doc+set}" = set; then
   enableval="$enable_html_doc"
   :
 else
-  enable_html_doc=yes
+  enable_html_doc=no
 fi
 
 # Check whether --enable-ps-doc or --disable-ps-doc was given.
@@ -2092,7 +2092,7 @@ if test "${enable_ps_doc+set}" = set; then
   enableval="$enable_ps_doc"
   :
 else
-  enable_ps_doc=yes
+  enable_ps_doc=no
 fi
 
 # Check whether --with-cint or --without-cint was given.
@@ -3025,7 +3025,6 @@ fi
 
 
 
-LIBGINACCINT=
 GINACCINTDIR=
 if test "x$with_cint" != "xno"; then
   if test "x$enable_static" != "xyes"; then
@@ -3042,7 +3041,7 @@ if test "x$with_cint" != "xno"; then
   # Extract the first word of "cint", so it can be a program name with args.
 set dummy cint; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3046: checking for $ac_word" >&5
+echo "configure:3045: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CINT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3078,7 +3077,7 @@ fi
   # Extract the first word of "makecint", so it can be a program name with args.
 set dummy makecint; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3082: checking for $ac_word" >&5
+echo "configure:3081: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MAKECINT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3115,12 +3114,12 @@ fi
     echo "$ac_t""creating cint/Makefile" 1>&6
     (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 \
+      -I .. -I $CINTSYSDIR -m -H ../ginac/ginac.h \
+      -C++ ginaccint.bin.cpp \
+      -l -L../ginac/.libs -lginac -lcln \
+      -cint -M0x10; \
     cd ..)
-    LIBGINACCINT="libginac.a"
     GINACCINTDIR="cint"
   else
     { echo "configure: error: Cannot configure GiNaC-cint" 1>&2; exit 1; }
@@ -3129,7 +3128,6 @@ fi
 
 
 
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -3338,7 +3336,6 @@ s%@REFERENCE_TARGETS@%$REFERENCE_TARGETS%g
 s%@CINT@%$CINT%g
 s%@MAKECINT@%$MAKECINT%g
 s%@CINTSYSDIR@%$CINTSYSDIR%g
-s%@LIBGINACCINT@%$LIBGINACCINT%g
 s%@GINACCINTDIR@%$GINACCINTDIR%g
 
 CEOF