ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/devel_omp/configure
(Generate patch)

Comparing trunk/configure (file contents):
Revision 44 by gezelter, Wed Oct 6 21:22:43 2004 UTC vs.
Revision 49 by gezelter, Wed Oct 6 23:03:34 2004 UTC

# Line 312 | Line 312 | ac_includes_default="\
312   # include <unistd.h>
313   #endif"
314  
315 < 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 PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES CPP EGREP LIBOBJS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI SPRNG_LIB_DIR SPRNG_INC_DIR SPRNG_LIB USE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LTLIBOBJS'
315 > 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 PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES CPP EGREP LIBOBJS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI SPRNG_LIB_DIR SPRNG_INC_DIR SPRNG_LIB USE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS LTLIBOBJS'
316   ac_subst_files=''
317  
318   # Initialize some variables set by options.
# Line 866 | Line 866 | Optional Features:
866    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
867    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
868    --enable-debug          Compile OOPSE in debug mode
869 +  --enable-doxygen        enable documentation generation with doxygen (auto)
870 +  --enable-dot            use 'dot' to generate graphs in doxygen (auto)
871 +  --enable-html-docs      enable HTML generation with doxygen (yes)
872 +  --enable-latex-docs     enable LaTeX documentation generation with doxygen (no)
873    --enable-oopse-home=DIR      define oopse home dir PREFIX/oopse
874  
875   Optional Packages:
# Line 1820 | Line 1824 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1824   # Figure out how the Fortran 90 compiler constructs module file names
1825   #
1826   # AC_F90_MODULE_NAMES
1827 +
1828 +
1829 +
1830  
1831  
1832  
# Line 3535 | Line 3542 | F90FLAGS="$F90FLAGS $ac_verb"
3542   ac_save_F90FLAGS=$F90FLAGS
3543   F90FLAGS="$F90FLAGS $ac_verb"
3544  
3545 < (eval echo $as_me:3538: \"$ac_link\") >&5
3545 > (eval echo $as_me:3545: \"$ac_link\") >&5
3546   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3547   echo "$ac_f90_v_output" >&5
3548   F90FLAGS=$ac_save_F90FLAGS
# Line 3612 | Line 3619 | F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3619   ac_save_F90FLAGS=$F90FLAGS
3620   F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
3621  
3622 < (eval echo $as_me:3615: \"$ac_link\") >&5
3622 > (eval echo $as_me:3622: \"$ac_link\") >&5
3623   ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
3624   echo "$ac_f90_v_output" >&5
3625   F90FLAGS=$ac_save_F90FLAGS
# Line 4939 | Line 4946 | done
4946  
4947  
4948    # clean out junk possibly left behind by a previous configuration
4949 <  rm -f utils/getopt.h
4949 >  rm -f src/utils/getopt.h
4950    # Check for getopt_long support
4951  
4952   for ac_header in getopt.h
# Line 5279 | Line 5286 | esac
5286    *) LIBOBJS="$LIBOBJS getopt1.$ac_objext" ;;
5287   esac
5288  
5289 <                ac_config_links="$ac_config_links utils/getopt.h:utils/gnugetopt.h"
5289 >                ac_config_links="$ac_config_links src/utils/getopt.h:src/utils/gnugetopt.h"
5290  
5291   fi
5292  
# Line 7744 | Line 7751 | echo "${ECHO_T}no" >&6
7751  
7752      echo "$as_me:$LINENO: result: no" >&5
7753   echo "${ECHO_T}no" >&6
7754 +
7755 + fi;
7756 +
7757 +
7758 +
7759 + # Check whether --enable-doxygen or --disable-doxygen was given.
7760 + if test "${enable_doxygen+set}" = set; then
7761 +  enableval="$enable_doxygen"
7762 +
7763 + fi;
7764 + # Check whether --enable-dot or --disable-dot was given.
7765 + if test "${enable_dot+set}" = set; then
7766 +  enableval="$enable_dot"
7767 +
7768 + fi;
7769 + # Check whether --enable-html-docs or --disable-html-docs was given.
7770 + if test "${enable_html_docs+set}" = set; then
7771 +  enableval="$enable_html_docs"
7772 +
7773 + else
7774 +   enable_html_docs=yes
7775 + fi;
7776 + # Check whether --enable-latex-docs or --disable-latex-docs was given.
7777 + if test "${enable_latex_docs+set}" = set; then
7778 +  enableval="$enable_latex_docs"
7779  
7780 + else
7781 +   enable_latex_docs=no
7782   fi;
7783 + if test "x$enable_doxygen" = xno; then
7784 +        enable_doc=no
7785 + else
7786 +        # Extract the first word of "doxygen", so it can be a program name with args.
7787 + set dummy doxygen; ac_word=$2
7788 + echo "$as_me:$LINENO: checking for $ac_word" >&5
7789 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7790 + if test "${ac_cv_path_DOXYGEN+set}" = set; then
7791 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7792 + else
7793 +  case $DOXYGEN in
7794 +  [\\/]* | ?:[\\/]*)
7795 +  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
7796 +  ;;
7797 +  *)
7798 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7799 + for as_dir in $PATH
7800 + do
7801 +  IFS=$as_save_IFS
7802 +  test -z "$as_dir" && as_dir=.
7803 +  for ac_exec_ext in '' $ac_executable_extensions; do
7804 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7805 +    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
7806 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7807 +    break 2
7808 +  fi
7809 + done
7810 + done
7811 +
7812 +  ;;
7813 + esac
7814 + fi
7815 + DOXYGEN=$ac_cv_path_DOXYGEN
7816 +
7817 + if test -n "$DOXYGEN"; then
7818 +  echo "$as_me:$LINENO: result: $DOXYGEN" >&5
7819 + echo "${ECHO_T}$DOXYGEN" >&6
7820 + else
7821 +  echo "$as_me:$LINENO: result: no" >&5
7822 + echo "${ECHO_T}no" >&6
7823 + fi
7824  
7825 +        if test "x$DOXYGEN" = x; then
7826 +                if test "x$enable_doxygen" = xyes; then
7827 +                        { { echo "$as_me:$LINENO: error: could not find doxygen" >&5
7828 + echo "$as_me: error: could not find doxygen" >&2;}
7829 +   { (exit 1); exit 1; }; }
7830 +                fi
7831 +                enable_doc=no
7832 +        else
7833 +                enable_doc=yes
7834 +                # Extract the first word of "dot", so it can be a program name with args.
7835 + set dummy dot; ac_word=$2
7836 + echo "$as_me:$LINENO: checking for $ac_word" >&5
7837 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7838 + if test "${ac_cv_path_DOT+set}" = set; then
7839 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7840 + else
7841 +  case $DOT in
7842 +  [\\/]* | ?:[\\/]*)
7843 +  ac_cv_path_DOT="$DOT" # Let the user override the test with a path.
7844 +  ;;
7845 +  *)
7846 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7847 + for as_dir in $PATH
7848 + do
7849 +  IFS=$as_save_IFS
7850 +  test -z "$as_dir" && as_dir=.
7851 +  for ac_exec_ext in '' $ac_executable_extensions; do
7852 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7853 +    ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
7854 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7855 +    break 2
7856 +  fi
7857 + done
7858 + done
7859  
7860 +  ;;
7861 + esac
7862 + fi
7863 + DOT=$ac_cv_path_DOT
7864  
7865 + if test -n "$DOT"; then
7866 +  echo "$as_me:$LINENO: result: $DOT" >&5
7867 + echo "${ECHO_T}$DOT" >&6
7868 + else
7869 +  echo "$as_me:$LINENO: result: no" >&5
7870 + echo "${ECHO_T}no" >&6
7871 + fi
7872 +
7873 +        fi
7874 + fi
7875 +
7876 + if test "x$enable_doc" = xyes; then
7877 +  DOC=1
7878 + else
7879 +  DOC=0
7880 + fi
7881 +
7882 +
7883 + if test x$DOT = x; then
7884 +        if test "x$enable_dot" = xyes; then
7885 +                { { echo "$as_me:$LINENO: error: could not find dot" >&5
7886 + echo "$as_me: error: could not find dot" >&2;}
7887 +   { (exit 1); exit 1; }; }
7888 +        fi
7889 +        enable_dot=no
7890 + else
7891 +        enable_dot=yes
7892 + fi
7893  
7894  
7895 +
7896 +
7897 +
7898 +
7899 +
7900   OBJEXT=".$OBJEXT"
7901  
7902   OOPSE=oopse
# Line 8342 | Line 8488 | do
8488    case "$ac_config_target" in
8489    # Handling of arguments.
8490    "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
8491 <  "utils/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS utils/getopt.h:utils/gnugetopt.h" ;;
8491 >  "src/utils/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/utils/getopt.h:src/utils/gnugetopt.h" ;;
8492    "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
8493    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
8494   echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
# Line 8493 | Line 8639 | s,@HAVE_MKL@,$HAVE_MKL,;t t
8639   s,@MKL_LIB@,$MKL_LIB,;t t
8640   s,@MKL_INC@,$MKL_INC,;t t
8641   s,@HAVE_MKL@,$HAVE_MKL,;t t
8642 + s,@DOXYGEN@,$DOXYGEN,;t t
8643 + s,@DOT@,$DOT,;t t
8644 + s,@DOC@,$DOC,;t t
8645 + s,@enable_dot@,$enable_dot,;t t
8646 + s,@enable_html_docs@,$enable_html_docs,;t t
8647 + s,@enable_latex_docs@,$enable_latex_docs,;t t
8648   s,@BATEXT@,$BATEXT,;t t
8649   s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
8650   s,@OOPSE@,$OOPSE,;t t

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines