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

Comparing trunk/configure (file contents):
Revision 1620 by gezelter, Fri Oct 15 17:34:49 2010 UTC vs.
Revision 1621 by gezelter, Mon Sep 12 18:19:40 2011 UTC

# Line 752 | Line 752 | CFLAGS
752   CCC
753   CC
754   CFLAGS
755 LDFLAGS
756 LIBS
757 CPPFLAGS
755   FC
756   FCFLAGS
760 LDFLAGS
761 LIBS
757   MPICXX
758   MPICC
759   MPIFC
760   CPP
766 CPPFLAGS
761   CXXCPP'
762  
763  
# Line 7952 | Line 7946 | $as_echo "$as_me: WARNING: Sorry, $qhull_dir does not
7946         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&5
7947   $as_echo "$as_me: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&2;}
7948         QHULL_HOME=/usr/local
7949 <       if test ! -f "${QHULL_HOME}/include/qhull/qhull.h"; then
7949 >       if test ! -f "${QHULL_HOME}/include/qhull/libqhull.h"; then
7950            QHULL_HOME=/usr
7951         fi
7952       fi
# Line 7976 | Line 7970 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7970          LDFLAGS="$LDFLAGS -L${QHULL_HOME}/lib"
7971          CXXFLAGS="$CXXFLAGS -I${QHULL_HOME}/include"
7972          CPPFLAGS="$CPPFLAGS -I${QHULL_HOME}/include"
7973 <        ac_fn_cxx_check_header_mongrel "$LINENO" "qhull/qhull.h" "ac_cv_header_qhull_qhull_h" "$ac_includes_default"
7974 < if test "x$ac_cv_header_qhull_qhull_h" = xyes; then :
7975 <  qhull_cv_qhull_h=yes
7973 >        ac_fn_cxx_check_header_mongrel "$LINENO" "qhull/libqhull.h" "ac_cv_header_qhull_libqhull_h" "$ac_includes_default"
7974 > if test "x$ac_cv_header_qhull_libqhull_h" = xyes; then :
7975 >  qhull_cv_libqhull_h=yes
7976   else
7977 <  qhull_cv_qhull_h=no
7977 >  qhull_cv_libqhull_h=no
7978   fi
7979  
7980  
# Line 8032 | Line 8026 | else
8026    qhull_cv_libqhull=yes
8027   else
8028    qhull_cv_libqhull=no
8029 + fi
8030 +
8031 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qh_qhull in -lqhull6" >&5
8032 + $as_echo_n "checking for qh_qhull in -lqhull6... " >&6; }
8033 + if ${ac_cv_lib_qhull6_qh_qhull+:} false; then :
8034 +  $as_echo_n "(cached) " >&6
8035 + else
8036 +  ac_check_lib_save_LIBS=$LIBS
8037 + LIBS="-lqhull6  $LIBS"
8038 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8039 + /* end confdefs.h.  */
8040 +
8041 + /* Override any GCC internal prototype to avoid an error.
8042 +   Use char because int might match the return type of a GCC
8043 +   builtin and then its argument prototype would still apply.  */
8044 + #ifdef __cplusplus
8045 + extern "C"
8046 + #endif
8047 + char qh_qhull ();
8048 + #ifdef FC_DUMMY_MAIN
8049 + #ifndef FC_DUMMY_MAIN_EQ_F77
8050 + #  ifdef __cplusplus
8051 +     extern "C"
8052 + #  endif
8053 +   int FC_DUMMY_MAIN() { return 1; }
8054 + #endif
8055 + #endif
8056 + int
8057 + main ()
8058 + {
8059 + return qh_qhull ();
8060 +  ;
8061 +  return 0;
8062 + }
8063 + _ACEOF
8064 + if ac_fn_cxx_try_link "$LINENO"; then :
8065 +  ac_cv_lib_qhull6_qh_qhull=yes
8066 + else
8067 +  ac_cv_lib_qhull6_qh_qhull=no
8068   fi
8069 + rm -f core conftest.err conftest.$ac_objext \
8070 +    conftest$ac_exeext conftest.$ac_ext
8071 + LIBS=$ac_check_lib_save_LIBS
8072 + fi
8073 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_qhull6_qh_qhull" >&5
8074 + $as_echo "$ac_cv_lib_qhull6_qh_qhull" >&6; }
8075 + if test "x$ac_cv_lib_qhull6_qh_qhull" = xyes; then :
8076 +  qhull_cv_libqhull6=yes
8077 + else
8078 +  qhull_cv_libqhull6=no
8079 + fi
8080  
8081          LDFLAGS="$QHULL_OLD_LDFLAGS"
8082          CXXFLAGS="$QHULL_OLD_CXXFLAGS"
# Line 8044 | Line 8088 | ac_compiler_gnu=$ac_cv_c_compiler_gnu
8088   ac_compiler_gnu=$ac_cv_c_compiler_gnu
8089  
8090  
8091 <        if test "$qhull_cv_libqhull" = "yes" -a "$qhull_cv_qhull_h" = "yes"; then
8091 >        if test "$qhull_cv_libqhull_h" = "yes" -a "$qhull_cv_libqhull" = "yes" -o "$qhull_cv_libqhull6" = "yes"; then
8092  
8093 < $as_echo "#define HAVE_QHULL_H 1" >>confdefs.h
8093 > $as_echo "#define HAVE_LIBQHULL_H 1" >>confdefs.h
8094 >
8095 >           if test "$qhull_cv_libqhull" = "yes"; then
8096 >
8097 > $as_echo "#define HAVE_QHULL 1" >>confdefs.h
8098  
8099 +                QHULL="-lqhull"
8100 +           fi
8101 +           if test "$qhull_cv_libqhull6" = "yes"; then
8102  
8103   $as_echo "#define HAVE_QHULL 1" >>confdefs.h
8104  
8105 +                QHULL="-lqhull6"
8106 +           fi
8107             USE_QHULL=yes
8108             QHULL_INC_DIR="${QHULL_HOME}/include"
8109             QHULL_LIB_DIR="${QHULL_HOME}/lib"
8057           QHULL="-lqhull"
8110             { $as_echo "$as_me:${as_lineno-$LINENO}: result: Working qhull found, will proceed." >&5
8111   $as_echo "Working qhull found, will proceed." >&6; }
8112          else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines