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

Comparing branches/development/configure (file contents):
Revision 1617 by gezelter, Thu Aug 4 21:02:06 2011 UTC vs.
Revision 1618 by gezelter, Mon Sep 12 17:09:26 2011 UTC

# Line 5673 | Line 5673 | $as_echo "$as_me: WARNING: Sorry, $qhull_dir does not
5673         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&5
5674   $as_echo "$as_me: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&2;}
5675         QHULL_HOME=/usr/local
5676 <       if test ! -f "${QHULL_HOME}/include/qhull/qhull.h"; then
5676 >       if test ! -f "${QHULL_HOME}/include/qhull/libqhull.h"; then
5677            QHULL_HOME=/usr
5678         fi
5679       fi
# Line 5697 | Line 5697 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
5697          LDFLAGS="$LDFLAGS -L${QHULL_HOME}/lib"
5698          CFLAGS="$CFLAGS -I${QHULL_HOME}/include"
5699          CPPFLAGS="$CPPFLAGS -I${QHULL_HOME}/include"
5700 <        ac_fn_c_check_header_mongrel "$LINENO" "qhull/qhull.h" "ac_cv_header_qhull_qhull_h" "$ac_includes_default"
5701 < if test "x$ac_cv_header_qhull_qhull_h" = xyes; then :
5702 <  qhull_cv_qhull_h=yes
5700 >        ac_fn_c_check_header_mongrel "$LINENO" "qhull/libqhull.h" "ac_cv_header_qhull_libqhull_h" "$ac_includes_default"
5701 > if test "x$ac_cv_header_qhull_libqhull_h" = xyes; then :
5702 >  qhull_cv_libqhull_h=yes
5703   else
5704 <  qhull_cv_qhull_h=no
5704 >  qhull_cv_libqhull_h=no
5705   fi
5706  
5707  
# Line 5745 | Line 5745 | else
5745    qhull_cv_libqhull=yes
5746   else
5747    qhull_cv_libqhull=no
5748 + fi
5749 +
5750 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qh_qhull in -lqhull6" >&5
5751 + $as_echo_n "checking for qh_qhull in -lqhull6... " >&6; }
5752 + if ${ac_cv_lib_qhull6_qh_qhull+:} false; then :
5753 +  $as_echo_n "(cached) " >&6
5754 + else
5755 +  ac_check_lib_save_LIBS=$LIBS
5756 + LIBS="-lqhull6  $LIBS"
5757 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5758 + /* end confdefs.h.  */
5759 +
5760 + /* Override any GCC internal prototype to avoid an error.
5761 +   Use char because int might match the return type of a GCC
5762 +   builtin and then its argument prototype would still apply.  */
5763 + #ifdef __cplusplus
5764 + extern "C"
5765 + #endif
5766 + char qh_qhull ();
5767 + int
5768 + main ()
5769 + {
5770 + return qh_qhull ();
5771 +  ;
5772 +  return 0;
5773 + }
5774 + _ACEOF
5775 + if ac_fn_c_try_link "$LINENO"; then :
5776 +  ac_cv_lib_qhull6_qh_qhull=yes
5777 + else
5778 +  ac_cv_lib_qhull6_qh_qhull=no
5779   fi
5780 + rm -f core conftest.err conftest.$ac_objext \
5781 +    conftest$ac_exeext conftest.$ac_ext
5782 + LIBS=$ac_check_lib_save_LIBS
5783 + fi
5784 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qhull6_qh_qhull" >&5
5785 + $as_echo "$ac_cv_lib_qhull6_qh_qhull" >&6; }
5786 + if test "x$ac_cv_lib_qhull6_qh_qhull" = xyes; then :
5787 +  qhull_cv_libqhull6=yes
5788 + else
5789 +  qhull_cv_libqhull6=no
5790 + fi
5791  
5792          LDFLAGS="$QHULL_OLD_LDFLAGS"
5793          CFLAGS="$QHULL_OLD_CFLAGS"
# Line 5757 | Line 5799 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
5799   ac_compiler_gnu=$ac_cv_c_compiler_gnu
5800  
5801  
5802 <        if test "$qhull_cv_libqhull" = "yes" -a "$qhull_cv_qhull_h" = "yes"; then
5802 >        if test "$qhull_cv_libqhull_h" = "yes" -a "$qhull_cv_libqhull" = "yes" -o "$qhull_cv_libqhull6" = "yes"; then
5803  
5804 < $as_echo "#define HAVE_QHULL_H 1" >>confdefs.h
5804 > $as_echo "#define HAVE_LIBQHULL_H 1" >>confdefs.h
5805 >
5806 >           if test "$qhull_cv_libqhull" = "yes"; then
5807 >
5808 > $as_echo "#define HAVE_QHULL 1" >>confdefs.h
5809  
5810 +                QHULL="-lqhull"
5811 +           fi
5812 +           if test "$qhull_cv_libqhull6" = "yes"; then
5813  
5814   $as_echo "#define HAVE_QHULL 1" >>confdefs.h
5815  
5816 +                QHULL="-lqhull6"
5817 +           fi
5818             USE_QHULL=yes
5819             QHULL_INC_DIR="${QHULL_HOME}/include"
5820             QHULL_LIB_DIR="${QHULL_HOME}/lib"
5770           QHULL="-lqhull"
5821             { $as_echo "$as_me:${as_lineno-$LINENO}: result: Working qhull found, will proceed." >&5
5822   $as_echo "Working qhull found, will proceed." >&6; }
5823          else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines