new configuration for TECPLOT

kdoc removed from configuration

git-svn-id: https://svn.dealii.org/trunk@9582 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index cab7275b45ae38fa6a8abb66c581e2db3aa71af5..073a004d765e08d16aaea86c9c6bdcf148dfa58f 100644 (file)
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -4060,21 +4060,19 @@ dnl
 dnl -------------------------------------------------------------
 AC_DEFUN(DEAL_II_CONFIGURE_TECPLOT, dnl
 [
-  AC_CHECK_FILE($TECHOME/lib/tecio.a,
-               TECPLOT_LIBRARY_PATH=$TECHOME/lib/tecio.a)
-  AC_CHECK_FILE($TEC80HOME/lib/tecio.a,
-               TECPLOT_LIBRARY_PATH=$TEC80HOME/lib/tecio.a)
-  AC_CHECK_FILE($TEC90HOME/lib/tecio.a,
-               TECPLOT_LIBRARY_PATH=$TEC90HOME/lib/tecio.a)
-  AC_CHECK_FILE($TECHOME/include/TECIO.h,
-               TECPLOT_INCLUDE_PATH=$TECHOME/include)
-  AC_CHECK_FILE($TEC80HOME/include/TECIO.h,
-               TECPLOT_INCLUDE_PATH=$TEC80HOME/include)
-  AC_CHECK_FILE($TEC90HOME/include/TECIO.h,
-               TECPLOT_INCLUDE_PATH=$TEC90HOME/include)
-
-  if (test -r "$TECPLOT_LIBRARY_PATH" && \
-      test -r "$TECPLOT_INCLUDE_PATH/TECIO.h") ; then
+  for i [ in $TECHOME $TEC80HOME $TEC90HOME ] ; do
+    AC_CHECK_FILE($i/lib/tecio.a,
+                 TECPLOT_LIB=$i/lib/tecio.a)
+    AC_CHECK_FILE($i/include/TECIO.h,
+                 TECPLOT_INCLUDE_DIR=-I$i/include,
+                 TECPLOT_LIB="")
+    if test "x$TECPLOT_LIB" != "x" ; then
+      break
+    fi
+  done
+
+  if (test -r "$TECPLOT_LIB" && \
+      test -r "$TECPLOT_INCLUDE_DIR/TECIO.h") ; then
     AC_DEFINE(DEAL_II_HAVE_TECPLOT, 1,
              [Flag indicating whether the library shall be compiled to use the Tecplot interface])
   fi
@@ -4302,9 +4300,9 @@ AC_DEFUN(DEAL_II_WITH_UMFPACK, dnl
   if test "x$1" != "xyes" ; then
     AC_MSG_RESULT(external version not yet supported)
   else
-    AC_SUBST(UMFPACK_LIB, '$(LIBDIR)/liblac_umfpack.$(lib-suffix)')
-    AC_SUBST(UMFPACK_LIBG, '$(LIBDIR)/liblac_umfpack.g.$(lib-suffix)')
-    AC_SUBST(UMFPACK_INCLUDE_DIR,'-I$D/contrib/umfpack/UMFPACK/Include')
+    UMFPACK_LIB ='$(LIBDIR)/liblac_umfpack.$(lib-suffix)'
+    UMFPACK_LIBG='$(LIBDIR)/liblac_umfpack.g.$(lib-suffix)'
+    UMFPACK_INCLUDE_DIR='-I$D/contrib/umfpack/UMFPACK/Include'
     AC_MSG_RESULT(using included version)
   fi
   AC_DEFINE(HAVE_UMFPACK,1,[UMFPACK is $1])
@@ -4321,19 +4319,15 @@ AC_DEFUN(DEAL_II_WITH_BLAS, dnl
 [
   if test "x$1" != "xyes" ; then
     AC_CHECK_LIB($1, daxpy_,
-      [
-        AC_SUBST(BLAS_LIB,"-l$1")
-      ],
+        BLAS_LIB="-l$1",
       AC_MSG_RESULT(not found),
       $F77LIBS)
   else
     AC_CHECK_LIB(blas, daxpy_,
-      [
-        AC_SUBST(BLAS_LIB,"-lblas")
-      ],
+        BLAS_LIB="-lblas",
       AC_MSG_RESULT(not found),
       $F77LIBS)
   fi
   AC_DEFINE(HAVE_BLAS)
   AC_SUBST(NEEDS_F77LIBS, "yes")
-])
\ No newline at end of file
+])

diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index e5ea118c0a3a10a6adad1f64645241b2ccafe264..9ce146dc30833ea2998b5835c0b62296e628b10c 100644 (file)
--- a/deal.II/common/Make.global_options.in
+++ b/deal.II/common/Make.global_options.in
@@ -35,7 +35,7 @@ F77                  = @F77@
 F77-VERSION          = @F77_VERSION@
 F77LIBS              = @F77LIBS@
 NEEDS_F77LIBS        = @NEEDS_F77LIBS@
-LIBS                 = @LIBS@ @BLAS_LIB@ @HSL_LIB@
+LIBS                 = @LIBS@ @TECPLOT_LIB@ @BLAS_LIB@ @HSL_LIB@
 LIBDIR               = $D/lib
 PERL                 = @PERL@
 enable-multithreading= @enablemultithreading@
@@ -54,9 +54,6 @@ DEAL_II_PETSC_VERSION_SUBMINOR = @DEAL_II_PETSC_VERSION_SUBMINOR@
 USE_CONTRIB_METIS    = @USE_CONTRIB_METIS@
 DEAL_II_METIS_DIR    = @DEAL_II_METIS_DIR@
 
-TECIO_INCLUDE        = @TECPLOT_INCLUDE_PATH@
-TECIO_LIBRARY        = @TECPLOT_LIBRARY_PATH@
-
 TARGET               = @target@
 
 # if FORTRAN sublibs are used, add F77 libs to linker flags
@@ -65,9 +62,6 @@ ifeq ($(NEEDS_F77LIBS),yes)
   LIBS    += $(F77LIBS)
 endif
 
-# if Tecplot is used, link against tecio.a
-LIBS += $(TECIO_LIBRARY)
-
 ######################################################
 # now configuration for compiler flags, pathes, etc
 
@@ -137,21 +131,13 @@ endif
 # environment variable, since the compiler will evaluate the value of
 # that anyway at compile time
 
-include-path-base            = $D/base/include
-include-path-lac             = $D/lac/include
-include-path-deal2           = $D/deal.II/include
-include-path-contrib-boost   = $D/contrib/boost/include
-include-path-tecplot         = $(TECIO_INCLUDE)
 include-path-petsc           = $(DEAL_II_PETSC_DIR)/include
 include-path-petsc-bmake     = $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)
 include-path-metis           = $(DEAL_II_METIS_DIR)/Lib
 
-INCLUDE           = $(addprefix -I, $(include-path-base) \
-                                    $(include-path-lac)  \
-                                    $(include-path-deal2)\
-                                   $(include-path-contrib-boost)\
-                                   $(include-path-tecplot)) \
-       @UMFPACK_INCLUDE_DIR@ @HSL_INCLUDE_DIR@
+INCLUDE = -I$D/base/include -I$D/lac/include -I$D/deal.II/include \
+         -I$D/contrib/boost/include \
+         @TECPLOT_INCLUDE_DIR@ @UMFPACK_INCLUDE_DIR@ @HSL_INCLUDE_DIR@
 
 # add PETSc and METIS include path if necessary. this rule
 # (and the one further down below to get correct flags) should eventually

diff --git a/deal.II/configure b/deal.II/configure
index 8bfa50fea462f55d590e3e5544f26b6c607e9349..e9447ab548ce7a79d9721d33288d902439ce84a4 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.173 .
+# From configure.in Revision: 1.174 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -274,7 +274,7 @@ PACKAGE_BUGREPORT=
 
 ac_unique_file="deal.II"
 ac_subdirs_all="$ac_subdirs_all contrib tests"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_VERSION DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD LDFLAGSPIC CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared lib_suffix AR RANLIB ac_ct_RANLIB TECPLOT_LIBRARY_PATH TECPLOT_INCLUDE_PATH HSL_LIB HSL_INCLUDE_DIR NEEDS_F77LIBS USE_CONTRIB_HSL USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_LIBG UMFPACK_INCLUDE_DIR BLAS_LIB DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_VERSION DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD LDFLAGSPIC CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared lib_suffix AR RANLIB ac_ct_RANLIB TECPLOT_LIB TECPLOT_INCLUDE_DIR HSL_LIB HSL_INCLUDE_DIR NEEDS_F77LIBS USE_CONTRIB_HSL USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_LIBG UMFPACK_INCLUDE_DIR BLAS_LIB DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -8580,9 +8580,10 @@ echo "$as_me:$LINENO: result: ---------------- configuring additional libs -----
 echo "${ECHO_T}---------------- configuring additional libs ----------------" >&6
 
 
-  as_ac_File=`echo "ac_cv_file_$TECHOME/lib/tecio.a" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $TECHOME/lib/tecio.a" >&5
-echo $ECHO_N "checking for $TECHOME/lib/tecio.a... $ECHO_C" >&6
+  for i  in $TECHOME $TEC80HOME $TEC90HOME  ; do
+    as_ac_File=`echo "ac_cv_file_$i/lib/tecio.a" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $i/lib/tecio.a" >&5
+echo $ECHO_N "checking for $i/lib/tecio.a... $ECHO_C" >&6
 if eval "test \"\${$as_ac_File+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8590,7 +8591,7 @@ else
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "$TECHOME/lib/tecio.a"; then
+if test -r "$i/lib/tecio.a"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -8599,12 +8600,12 @@ fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
 if test `eval echo '${'$as_ac_File'}'` = yes; then
-  TECPLOT_LIBRARY_PATH=$TECHOME/lib/tecio.a
+  TECPLOT_LIB=$i/lib/tecio.a
 fi
 
-  as_ac_File=`echo "ac_cv_file_$TEC80HOME/lib/tecio.a" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $TEC80HOME/lib/tecio.a" >&5
-echo $ECHO_N "checking for $TEC80HOME/lib/tecio.a... $ECHO_C" >&6
+    as_ac_File=`echo "ac_cv_file_$i/include/TECIO.h" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $i/include/TECIO.h" >&5
+echo $ECHO_N "checking for $i/include/TECIO.h... $ECHO_C" >&6
 if eval "test \"\${$as_ac_File+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -8612,7 +8613,7 @@ else
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "$TEC80HOME/lib/tecio.a"; then
+if test -r "$i/include/TECIO.h"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -8621,100 +8622,18 @@ fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
 if test `eval echo '${'$as_ac_File'}'` = yes; then
-  TECPLOT_LIBRARY_PATH=$TEC80HOME/lib/tecio.a
-fi
-
-  as_ac_File=`echo "ac_cv_file_$TEC90HOME/lib/tecio.a" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $TEC90HOME/lib/tecio.a" >&5
-echo $ECHO_N "checking for $TEC90HOME/lib/tecio.a... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "$TEC90HOME/lib/tecio.a"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-  TECPLOT_LIBRARY_PATH=$TEC90HOME/lib/tecio.a
-fi
-
-  as_ac_File=`echo "ac_cv_file_$TECHOME/include/TECIO.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $TECHOME/include/TECIO.h" >&5
-echo $ECHO_N "checking for $TECHOME/include/TECIO.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  TECPLOT_INCLUDE_DIR=-I$i/include
 else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "$TECHOME/include/TECIO.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-  TECPLOT_INCLUDE_PATH=$TECHOME/include
-fi
-
-  as_ac_File=`echo "ac_cv_file_$TEC80HOME/include/TECIO.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $TEC80HOME/include/TECIO.h" >&5
-echo $ECHO_N "checking for $TEC80HOME/include/TECIO.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "$TEC80HOME/include/TECIO.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-  TECPLOT_INCLUDE_PATH=$TEC80HOME/include
-fi
-
-  as_ac_File=`echo "ac_cv_file_$TEC90HOME/include/TECIO.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $TEC90HOME/include/TECIO.h" >&5
-echo $ECHO_N "checking for $TEC90HOME/include/TECIO.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "$TEC90HOME/include/TECIO.h"; then
-  eval "$as_ac_File=yes"
-else
-  eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
-  TECPLOT_INCLUDE_PATH=$TEC90HOME/include
+  TECPLOT_LIB=""
 fi
 
+    if test "x$TECPLOT_LIB" != "x" ; then
+      break
+    fi
+  done
 
-  if (test -r "$TECPLOT_LIBRARY_PATH" && \
-      test -r "$TECPLOT_INCLUDE_PATH/TECIO.h") ; then
+  if (test -r "$TECPLOT_LIB" && \
+      test -r "$TECPLOT_INCLUDE_DIR/TECIO.h") ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define DEAL_II_HAVE_TECPLOT 1
@@ -8973,12 +8892,9 @@ echo $ECHO_N "checking UmfPack library... $ECHO_C" >&6
     echo "$as_me:$LINENO: result: external version not yet supported" >&5
 echo "${ECHO_T}external version not yet supported" >&6
   else
-    UMFPACK_LIB='$(LIBDIR)/liblac_umfpack.$(lib-suffix)'
-
+    UMFPACK_LIB ='$(LIBDIR)/liblac_umfpack.$(lib-suffix)'
     UMFPACK_LIBG='$(LIBDIR)/liblac_umfpack.g.$(lib-suffix)'
-
     UMFPACK_INCLUDE_DIR='-I$D/contrib/umfpack/UMFPACK/Include'
-
     echo "$as_me:$LINENO: result: using included version" >&5
 echo "${ECHO_T}using included version" >&6
   fi
@@ -8991,12 +8907,12 @@ _ACEOF
     with_blas="yes"
   fi
 
-else
-  withumfpack=no
 fi;
 
 
 
+
+
 echo "$as_me:$LINENO: checking for degsl_ in -llapack" >&5
 echo $ECHO_N "checking for degsl_ in -llapack... $ECHO_C" >&6
 if test "${ac_cv_lib_lapack_degsl_+set}" = set; then
@@ -9143,10 +9059,7 @@ fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-        BLAS_LIB="-l$withval"
-
-
+  BLAS_LIB="-l$withval"
 else
   echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
@@ -9218,10 +9131,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_blas_daxpy_" >&5
 echo "${ECHO_T}$ac_cv_lib_blas_daxpy_" >&6
 if test $ac_cv_lib_blas_daxpy_ = yes; then
-
-        BLAS_LIB="-lblas"
-
-
+  BLAS_LIB="-lblas"
 else
   echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
@@ -9235,11 +9145,10 @@ _ACEOF
   NEEDS_F77LIBS="yes"
 
 
-else
-  withblas=no
 fi;
 
 
+
 echo "$as_me:$LINENO: result: " >&5
 echo "${ECHO_T}" >&6
 echo "$as_me:$LINENO: result: ------------------ checking compiler flags ------------------" >&5
@@ -9600,7 +9509,7 @@ echo "${ECHO_T}--------------------- generating output ---------------------" >&
 
 
 
-                                                                                ac_config_files="$ac_config_files common/Make.global_options common/Makefile.template common/scripts/make_dependencies.pl doc/Makefile doc/auto/Makefile doc/auto/kdoc/Makefile doc/doxygen/Makefile doc/doxygen/options.dox"
+                                                            ac_config_files="$ac_config_files common/Make.global_options common/Makefile.template common/scripts/make_dependencies.pl doc/Makefile doc/doxygen/Makefile doc/doxygen/options.dox"
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -10076,8 +9985,6 @@ do
   "common/Makefile.template" ) CONFIG_FILES="$CONFIG_FILES common/Makefile.template" ;;
   "common/scripts/make_dependencies.pl" ) CONFIG_FILES="$CONFIG_FILES common/scripts/make_dependencies.pl" ;;
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  "doc/auto/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/auto/Makefile" ;;
-  "doc/auto/kdoc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/auto/kdoc/Makefile" ;;
   "doc/doxygen/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/Makefile" ;;
   "doc/doxygen/options.dox" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/options.dox" ;;
   "base/include/base/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS base/include/base/config.h" ;;
@@ -10212,8 +10119,8 @@ s,@lib_suffix@,$lib_suffix,;t t
 s,@AR@,$AR,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@TECPLOT_LIBRARY_PATH@,$TECPLOT_LIBRARY_PATH,;t t
-s,@TECPLOT_INCLUDE_PATH@,$TECPLOT_INCLUDE_PATH,;t t
+s,@TECPLOT_LIB@,$TECPLOT_LIB,;t t
+s,@TECPLOT_INCLUDE_DIR@,$TECPLOT_INCLUDE_DIR,;t t
 s,@HSL_LIB@,$HSL_LIB,;t t
 s,@HSL_INCLUDE_DIR@,$HSL_INCLUDE_DIR,;t t
 s,@NEEDS_F77LIBS@,$NEEDS_F77LIBS,;t t

diff --git a/deal.II/configure.in b/deal.II/configure.in
index ec784463304c3f173e9a267fd08797e88c959503..02f33bce7a6bf02500445d76e605ce1e056bb6a3 100644 (file)
--- a/deal.II/configure.in
+++ b/deal.II/configure.in
@@ -316,8 +316,8 @@ AC_MSG_RESULT()
 AC_MSG_RESULT(---------------- configuring additional libs ----------------)
 
 DEAL_II_CONFIGURE_TECPLOT
-AC_SUBST(TECPLOT_LIBRARY_PATH)
-AC_SUBST(TECPLOT_INCLUDE_PATH)
+AC_SUBST(TECPLOT_LIB)
+AC_SUBST(TECPLOT_INCLUDE_DIR)
 
 DEAL_II_CONFIGURE_HSL
 AC_SUBST(USE_CONTRIB_HSL)
@@ -341,9 +341,10 @@ AC_ARG_WITH(umfpack,
   [  --with-umfpack=umfpack-root-directory,
       use contributed UMFPack is no directory is given.
       Default is not to use UMFPack],
-  DEAL_II_WITH_UMFPACK($withval),
-  withumfpack=no)
-
+  DEAL_II_WITH_UMFPACK($withval))
+AC_SUBST(UMFPACK_LIB)
+AC_SUBST(UMFPACK_LIBG)
+AC_SUBST(UMFPACK_INCLUDE_DIR)
 
 dnl Check for LAPACK
 AC_CHECK_LIB(lapack, degsl_)
@@ -351,8 +352,8 @@ AC_CHECK_LIB(lapack, degsl_)
 dnl Check for blas. Must be after UMFPack and LAPACK!
 AC_ARG_WITH(blas,
   [  --with-blas=blaslib use the blas library],
-  DEAL_II_WITH_BLAS($withval),
-  withblas=no)
+  DEAL_II_WITH_BLAS($withval))
+AC_SUBST(BLAS_LIB)
 
 dnl -------------------------------------------------------------
 dnl       Optimizations and consistency of compiler flags
@@ -540,8 +541,6 @@ AC_OUTPUT([common/Make.global_options
            common/Makefile.template 
            common/scripts/make_dependencies.pl
            doc/Makefile 
-           doc/auto/Makefile 
-           doc/auto/kdoc/Makefile
           doc/doxygen/Makefile
            doc/doxygen/options.dox])