X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=configure;h=273451401438724a46e41d7847e22c2bc697e847;hb=3b977d948fc46a88dc5145757bf46ab40b7af44e;hp=04b641a69f0ca500de618e746b489a4793cf5733;hpb=ab58fe9dace168295f9fac116ec4381103fb225e;p=ginac.git

diff --git a/configure b/configure
index 04b641a6..27345140 100755
--- a/configure
+++ b/configure
@@ -12,9 +12,9 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --enable-help-doc       build HTML documentation [default=yes]"
+  --enable-html-doc       build HTML documentation [default=yes]"
 ac_help="$ac_help
-  --enable-ps-doc         build PostScript documentation [default=no]"
+  --enable-ps-doc         build PostScript documentation [default=yes]"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -553,16 +553,16 @@ if test "${enable_ps_doc+set}" = set; then
   enableval="$enable_ps_doc"
   :
 else
-  enable_ps_doc=no
+  enable_ps_doc=yes
 fi
 
 
 
 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
 
 
@@ -2662,7 +2662,7 @@ fi
     "fail")
         LIBS="${saved_LIBS}"
         echo "$ac_t""" 1>&6
-        { echo "configure: error: linking with libcln failed, maybe forgot to set \$LDFLAGS?" 1>&2; exit 1; }
+        { echo "configure: error: linking with libcln failed, maybe need to set \$LDFLAGS?" 1>&2; exit 1; }
     ;;
     *)
         LIBS="${saved_LIBS}"
@@ -2670,10 +2670,15 @@ fi
     esac
 
 
+GINACLIB_CPPFLAGS=$CPPFLAGS
+GINACLIB_LIBS=$LIBS
+
+
+
 # Extract the first word of "doxygen", so it can be a program name with args.
 set dummy doxygen; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2677: checking for $ac_word" >&5
+echo "configure:2682: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2706,82 +2711,10 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-# Extract the first word of "jade", so it can be a program name with args.
-set dummy jade; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2713: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_JADE'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$JADE" in
-  /*)
-  ac_cv_path_JADE="$JADE" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_JADE="$JADE" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_JADE="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_JADE" && ac_cv_path_JADE=""""
-  ;;
-esac
-fi
-JADE="$ac_cv_path_JADE"
-if test -n "$JADE"; then
-  echo "$ac_t""$JADE" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "jadetex", so it can be a program name with args.
-set dummy jadetex; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2749: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_JADETEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$JADETEX" in
-  /*)
-  ac_cv_path_JADETEX="$JADETEX" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_JADETEX="$JADETEX" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_JADETEX="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_JADETEX" && ac_cv_path_JADETEX=""""
-  ;;
-esac
-fi
-JADETEX="$ac_cv_path_JADETEX"
-if test -n "$JADETEX"; then
-  echo "$ac_t""$JADETEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
 # Extract the first word of "latex", so it can be a program name with args.
 set dummy latex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2785: checking for $ac_word" >&5
+echo "configure:2718: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2817,7 +2750,7 @@ fi
 # Extract the first word of "makeindex", so it can be a program name with args.
 set dummy makeindex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2821: checking for $ac_word" >&5
+echo "configure:2754: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MAKEINDEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2853,7 +2786,7 @@ fi
 # Extract the first word of "dvips", so it can be a program name with args.
 set dummy dvips; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2857: checking for $ac_word" >&5
+echo "configure:2790: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2889,7 +2822,7 @@ fi
 # Extract the first word of "fig2dev", so it can be a program name with args.
 set dummy fig2dev; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2893: checking for $ac_word" >&5
+echo "configure:2826: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_FIG2DEV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2926,13 +2859,16 @@ fi
 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
 
 
@@ -3041,6 +2977,7 @@ ac_given_INSTALL="$INSTALL"
 trap 'rm -fr `echo "
 Makefile
 GiNaC.spec
+ginac-config
 ginac/Makefile
 check/Makefile
 ginsh/Makefile
@@ -3127,9 +3064,9 @@ s%@CPP@%$CPP%g
 s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
 s%@YACC@%$YACC%g
 s%@GINSH_LIBS@%$GINSH_LIBS%g
+s%@GINACLIB_CPPFLAGS@%$GINACLIB_CPPFLAGS%g
+s%@GINACLIB_LIBS@%$GINACLIB_LIBS%g
 s%@DOXYGEN@%$DOXYGEN%g
-s%@JADE@%$JADE%g
-s%@JADETEX@%$JADETEX%g
 s%@LATEX@%$LATEX%g
 s%@MAKEINDEX@%$MAKEINDEX%g
 s%@DVIPS@%$DVIPS%g
@@ -3179,6 +3116,7 @@ cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
 GiNaC.spec
+ginac-config
 ginac/Makefile
 check/Makefile
 ginsh/Makefile
@@ -3358,7 +3296,7 @@ cat >> $CONFIG_STATUS <<EOF
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-
+chmod +x ginac-config
 exit 0
 EOF
 chmod +x $CONFIG_STATUS