From f41d36855e0526170814c6ac47a05d4f85838973 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 26 Jan 2004 15:52:17 +0000 Subject: [PATCH] Don't check for Doc++ any more, since we don't reference it any more at all. git-svn-id: https://svn.dealii.org/trunk@8333 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 27 ------------------ deal.II/configure | 68 +------------------------------------------- deal.II/configure.in | 3 -- 3 files changed, 1 insertion(+), 97 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 5f9c5676c7..d247ffef7c 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -3389,30 +3389,3 @@ AC_DEFUN(DEAL_II_CHECK_KDOC, dnl AC_MSG_RESULT(using default version $kdocversion) fi ]) - - - -dnl ------------------------------------------------------------- -dnl Check for Doc++. -dnl -dnl Usage: DEAL_II_CHECK_DOCXX -dnl -dnl ------------------------------------------------------------- -AC_DEFUN(DEAL_II_CHECK_DOCXX, dnl -[ - AC_ARG_WITH(docxx, - [ --with-docxx=PATH use the doc++ executable pointed to by PATH], - docxx=$withval, - docxx=to-be-determined) - if test "$docxx" = to-be-determined ; then - AC_PATH_PROG(docxx,"doc++") - else - AC_MSG_CHECKING(for doc++) - if test -x "$docxx" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - docxx= - fi - fi -]) diff --git a/deal.II/configure b/deal.II/configure index 03e4ba4c26..c415302363 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -273,7 +273,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 enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared lib_suffix AR RANLIB ac_ct_RANLIB enablemultigrid TECPLOT_LIBRARY_PATH TECPLOT_INCLUDE_PATH USE_CONTRIB_HSL kdocdir kdocversion docxx 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 enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared lib_suffix AR RANLIB ac_ct_RANLIB enablemultigrid TECPLOT_LIBRARY_PATH TECPLOT_INCLUDE_PATH USE_CONTRIB_HSL kdocdir kdocversion PERL subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -829,7 +829,6 @@ Optional Packages: rather than just generating code for this processor family --with-kdoc=DIR use kdoc installed in DIR - --with-docxx=PATH use the doc++ executable pointed to by PATH Some influential environment variables: CC C compiler command @@ -7652,70 +7651,6 @@ echo "${ECHO_T}using default version $kdocversion" >&6 - - -# Check whether --with-docxx or --without-docxx was given. -if test "${with_docxx+set}" = set; then - withval="$with_docxx" - docxx=$withval -else - docxx=to-be-determined -fi; - if test "$docxx" = to-be-determined ; then - # Extract the first word of ""doc++"", so it can be a program name with args. -set dummy "doc++"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_docxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $docxx in - [\\/]* | ?:[\\/]*) - ac_cv_path_docxx="$docxx" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_docxx="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -docxx=$ac_cv_path_docxx - -if test -n "$docxx"; then - echo "$as_me:$LINENO: result: $docxx" >&5 -echo "${ECHO_T}$docxx" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - else - echo "$as_me:$LINENO: checking for doc++" >&5 -echo $ECHO_N "checking for doc++... $ECHO_C" >&6 - if test -x "$docxx" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - docxx= - fi - fi - - - # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -8397,7 +8332,6 @@ s,@TECPLOT_INCLUDE_PATH@,$TECPLOT_INCLUDE_PATH,;t t s,@USE_CONTRIB_HSL@,$USE_CONTRIB_HSL,;t t s,@kdocdir@,$kdocdir,;t t s,@kdocversion@,$kdocversion,;t t -s,@docxx@,$docxx,;t t s,@PERL@,$PERL,;t t s,@subdirs@,$subdirs,;t t s,@LIBOBJS@,$LIBOBJS,;t t diff --git a/deal.II/configure.in b/deal.II/configure.in index 228fc58ad5..d8e5b74be0 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -365,9 +365,6 @@ DEAL_II_CHECK_KDOC AC_SUBST(kdocdir) AC_SUBST(kdocversion) -DEAL_II_CHECK_DOCXX -AC_SUBST(docxx) - AC_PATH_PROG(PERL, perl) AC_SUBST(PERL) -- 2.39.5