ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/ac-tools/OpenMD.m4
(Generate patch)

Comparing branches/development/ac-tools/OpenMD.m4 (file contents):
Revision 1603 by gezelter, Thu Aug 4 21:02:06 2011 UTC vs.
Revision 1618 by gezelter, Mon Sep 12 17:09:26 2011 UTC

# Line 647 | Line 647 | if test "$qhull_dir" != "no"; then
647       else
648         AC_MSG_WARN([Sorry, $qhull_dir does not exist, checking usual places])
649         QHULL_HOME=/usr/local
650 <       if test ! -f "${QHULL_HOME}/include/qhull/qhull.h"; then
650 >       if test ! -f "${QHULL_HOME}/include/qhull/libqhull.h"; then
651            QHULL_HOME=/usr
652         fi
653       fi
# Line 665 | Line 665 | if test "$qhull_dir" != "no"; then
665          LDFLAGS="$LDFLAGS -L${QHULL_HOME}/lib"
666          CFLAGS="$CFLAGS -I${QHULL_HOME}/include"
667          CPPFLAGS="$CPPFLAGS -I${QHULL_HOME}/include"
668 <        AC_CHECK_HEADER(qhull/qhull.h, [qhull_cv_qhull_h=yes], [qhull_cv_qhull_h=no])
669 <        AC_CHECK_LIB(qhull, qh_qhull, [qhull_cv_libqhull=yes], [qhull_cv_libqhull=no])
668 >        AC_CHECK_HEADER(qhull/libqhull.h, [qhull_cv_libqhull_h=yes], [qhull_cv_libqhull_h=no])
669 >        AC_CHECK_LIB(qhull, qh_qhull, [qhull_cv_libqhull=yes], [qhull_cv_libqhull=no])        
670 >        AC_CHECK_LIB(qhull6, qh_qhull, [qhull_cv_libqhull6=yes], [qhull_cv_libqhull6=no])
671          LDFLAGS="$QHULL_OLD_LDFLAGS"
672          CFLAGS="$QHULL_OLD_CFLAGS"
673          CPPFLAGS="$QHULL_OLD_CPPFLAGS"
674          AC_LANG_RESTORE
675  
676 <        if test "$qhull_cv_libqhull" = "yes" -a "$qhull_cv_qhull_h" = "yes"; then
677 <           AC_DEFINE(HAVE_QHULL_H, 1, [have qhull.h])
678 <           AC_DEFINE(HAVE_QHULL, 1, [have libqhull.a])
676 >        if test "$qhull_cv_libqhull_h" = "yes" -a "$qhull_cv_libqhull" = "yes" -o "$qhull_cv_libqhull6" = "yes"; then
677 >           AC_DEFINE(HAVE_LIBQHULL_H, 1, [have libqhull.h])
678 >           if test "$qhull_cv_libqhull" = "yes"; then
679 >                AC_DEFINE(HAVE_QHULL, 1, [have libqhull.a])
680 >                QHULL="-lqhull"
681 >           fi
682 >           if test "$qhull_cv_libqhull6" = "yes"; then
683 >                AC_DEFINE(HAVE_QHULL, 1, [have libqhull6.a])
684 >                QHULL="-lqhull6"
685 >           fi
686             USE_QHULL=yes                
687             QHULL_INC_DIR="${QHULL_HOME}/include"
688             QHULL_LIB_DIR="${QHULL_HOME}/lib"
681           QHULL="-lqhull"
689             AC_MSG_RESULT([Working qhull found, will proceed.])
690          else
691             AC_MSG_WARN([])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines