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

Comparing trunk/configure (file contents):
Revision 1281 by gezelter, Wed Jul 16 02:34:05 2008 UTC vs.
Revision 1311 by gezelter, Tue Oct 21 18:50:37 2008 UTC

# Line 8931 | Line 8931 | else
8931   if test "${with_qhull+set}" = set; then
8932    withval=$with_qhull; qhull_dir="$withval"
8933   else
8934 <                qhull_dir="not_set"
8934 >  qhull_dir="not_set"
8935   fi
8936  
8937 < if test "$qhull_dir" != "no"; then
8937 > QHULL_INC_DIR=
8938 > QHULL_LIB_DIR=
8939 > QHULL=
8940 > USE_QHULL=no
8941  
8942 < if test "$qhull_dir" != "not_set" ; then
8943 <  if test -d "$qhull_dir"
8944 <  then
8945 <    QHULL_HOME="$qhull_dir"
8946 <  else
8947 <    { $as_echo "$as_me:$LINENO: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&5
8942 > if test "$qhull_dir" != "no"; then
8943 >   if test "$qhull_dir" != "not_set" ; then
8944 >     if test -d "$qhull_dir"; then
8945 >       QHULL_HOME="$qhull_dir"
8946 >     else
8947 >       { $as_echo "$as_me:$LINENO: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&5
8948   $as_echo "$as_me: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&2;}
8949 <        QHULL_HOME=/usr/local
8950 <        if test ! -f "${QHULL_HOME}/include/qhull/qhull.h"
8951 <        then
8952 <                QHULL_HOME=/usr
8953 <        fi
8954 <  fi
8955 < fi
8956 < #
8957 < # Locate qhull, if wanted
8958 < #
8959 < if test -n "${QHULL_HOME}"
8960 < then
8949 >       QHULL_HOME=/usr/local
8950 >       if test ! -f "${QHULL_HOME}/include/qhull/qhull.h"; then
8951 >          QHULL_HOME=/usr
8952 >       fi
8953 >     fi
8954 >   fi
8955 >   #
8956 >   # Locate qhull, if wanted
8957 >   #
8958 >   if test -n "${QHULL_HOME}"; then
8959 >        { $as_echo "$as_me:$LINENO: Checking for qhull in ${QHULL_HOME}" >&5
8960 > $as_echo "$as_me: Checking for qhull in ${QHULL_HOME}" >&6;}
8961  
8962          ac_ext=c
8963   ac_cpp='$CPP $CPPFLAGS'
# Line 9207 | Line 9210 | _ACEOF
9210   #define HAVE_QHULL 1
9211   _ACEOF
9212  
9213 <                USE_QHULL=yes
9214 <                QHULL_INC_DIR="${QHULL_HOME}/include"
9215 <                QHULL_LIB_DIR="${QHULL_HOME}/lib"
9216 <                QHULL="-lqhull"
9213 >           USE_QHULL=yes
9214 >           QHULL_INC_DIR="${QHULL_HOME}/include"
9215 >           QHULL_LIB_DIR="${QHULL_HOME}/lib"
9216 >           QHULL="-lqhull"
9217 >           { $as_echo "$as_me:$LINENO: result: Working qhull found, will proceed." >&5
9218 > $as_echo "Working qhull found, will proceed." >&6; }
9219          else
9220 <                { $as_echo "$as_me:$LINENO: checking qhull in ${QHULL_HOME}" >&5
9221 < $as_echo_n "checking qhull in ${QHULL_HOME}... " >&6; }
9222 <                QHULL_INC_DIR=
9223 <                QHULL_LIB_DIR=
9224 <                QHULL=
9225 <                USE_QHULL=no
9226 <                { $as_echo "$as_me:$LINENO: result: failed" >&5
9227 < $as_echo "failed" >&6; }
9228 <                echo ""
9229 <                echo "*********************************************************"
9230 <                echo "* WARNING: Could not find a working qhull installation  *"
9231 <                echo "* If you need OOPSE to be able to deal with convex      *"
9232 <                echo "* hulls be sure to specify a valid qhull installation   *"
9233 <                echo "* with --with-qhull=DIR                                 *"
9234 <                echo "*                                                       *"
9235 <                echo "* OOPSE will still work without qhull installed.        *"
9231 <                echo "*********************************************************"
9232 <                echo ""
9220 >           { $as_echo "$as_me:$LINENO: WARNING: " >&5
9221 > $as_echo "$as_me: WARNING: " >&2;}
9222 >           { $as_echo "$as_me:$LINENO: WARNING: Could not find a working qhull installation" >&5
9223 > $as_echo "$as_me: WARNING: Could not find a working qhull installation" >&2;}
9224 >           { $as_echo "$as_me:$LINENO: WARNING: If you need OOPSE to be able to deal with convex    " >&5
9225 > $as_echo "$as_me: WARNING: If you need OOPSE to be able to deal with convex    " >&2;}
9226 >           { $as_echo "$as_me:$LINENO: WARNING: hulls be sure to specify a valid qhull installation " >&5
9227 > $as_echo "$as_me: WARNING: hulls be sure to specify a valid qhull installation " >&2;}
9228 >           { $as_echo "$as_me:$LINENO: WARNING: with --with-qhull=DIR                               " >&5
9229 > $as_echo "$as_me: WARNING: with --with-qhull=DIR                               " >&2;}
9230 >           { $as_echo "$as_me:$LINENO: WARNING: " >&5
9231 > $as_echo "$as_me: WARNING: " >&2;}
9232 >           { $as_echo "$as_me:$LINENO: WARNING: OOPSE will still work without qhull installed.      " >&5
9233 > $as_echo "$as_me: WARNING: OOPSE will still work without qhull installed.      " >&2;}
9234 >           { $as_echo "$as_me:$LINENO: WARNING: " >&5
9235 > $as_echo "$as_me: WARNING: " >&2;}
9236          fi
9237 +    fi
9238 + fi
9239  
9240  
9241  
9242  
9238 – fi
9239 – fi
9243  
9244  
9245   ac_ext=cpp
# Line 13343 | Line 13346 | fi
13346  
13347  
13348  
13349 < ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/math/Makefile src/applications/atom2md/Makefile scripts/filepp"
13349 > ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/math/Makefile src/integrators/Makefile src/applications/atom2md/Makefile scripts/filepp"
13350  
13351  
13352   cat >confcache <<\_ACEOF
# Line 13934 | Line 13937 | do
13937      "make/Makefile") CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
13938      "src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
13939      "src/math/Makefile") CONFIG_FILES="$CONFIG_FILES src/math/Makefile" ;;
13940 +    "src/integrators/Makefile") CONFIG_FILES="$CONFIG_FILES src/integrators/Makefile" ;;
13941      "src/applications/atom2md/Makefile") CONFIG_FILES="$CONFIG_FILES src/applications/atom2md/Makefile" ;;
13942      "scripts/filepp") CONFIG_FILES="$CONFIG_FILES scripts/filepp" ;;
13943  
# Line 14550 | Line 14554 | $as_echo "$as_me: error: could not create -" >&2;}
14554      "make/Makefile":F) chmod 0755 scripts/* ;;
14555      "src/utils/Makefile":F) chmod 0755 scripts/* ;;
14556      "src/math/Makefile":F) chmod 0755 scripts/* ;;
14557 +    "src/integrators/Makefile":F) chmod 0755 scripts/* ;;
14558      "src/applications/atom2md/Makefile":F) chmod 0755 scripts/* ;;
14559      "scripts/filepp":F) chmod 0755 scripts/* ;;
14560  

Diff Legend

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