fix path to libhmsbeagle

diff --git a/src/configure.in b/src/configure.in
index acdae5a4fbe58827c23165948f8bd912ea1b2748..f0341cafefffd4dfd102b05c55ab3bb870e8b78a 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -96,25 +96,33 @@ then
        [BEAGLE_CFLAGS="-I$with_beagle/include/libhmsbeagle"],
        [AC_CHECK_FILE($with_beagle/include/libhmsbeagle-1/libhmsbeagle/beagle.h,
         [BEAGLE_CFLAGS="-I$with_beagle/include/libhmsbeagle-1"],   
        [BEAGLE_CFLAGS="-I$with_beagle/include/libhmsbeagle"],
        [AC_CHECK_FILE($with_beagle/include/libhmsbeagle-1/libhmsbeagle/beagle.h,
         [BEAGLE_CFLAGS="-I$with_beagle/include/libhmsbeagle-1"],   

+        [AC_CHECK_FILE($with_beagle/libhmsbeagle/beagle.h,
+            [BEAGLE_CFLAGS="-I$with_beagle"],   

         [AC_MSG_ERROR([beagle's library include file beagle.h is not found neither in 
          ${with_beagle}/include/libhmsbeagle/libhmsbeagle/ nor in 
          ${with_beagle}/include/libhmsbeagle-1/libhmsbeagle/]. You should either install 
          beagle library from http://code.google.com/p/beagle-lib/ or disable use of 
          beagle library by invoking configure script with option --with-beagle=no. 
          Note: without beagle library MrBayes may run slower.)])])
         [AC_MSG_ERROR([beagle's library include file beagle.h is not found neither in 
          ${with_beagle}/include/libhmsbeagle/libhmsbeagle/ nor in 
          ${with_beagle}/include/libhmsbeagle-1/libhmsbeagle/]. You should either install 
          beagle library from http://code.google.com/p/beagle-lib/ or disable use of 
          beagle library by invoking configure script with option --with-beagle=no. 
          Note: without beagle library MrBayes may run slower.)])])

+         ])

     AC_CHECK_FILE($with_beagle/include/libhmsbeagle/libhmsbeagle/platform.h,,
        [AC_CHECK_FILE($with_beagle/include/libhmsbeagle-1/libhmsbeagle/platform.h,,   
     AC_CHECK_FILE($with_beagle/include/libhmsbeagle/libhmsbeagle/platform.h,,
        [AC_CHECK_FILE($with_beagle/include/libhmsbeagle-1/libhmsbeagle/platform.h,,   

+         [AC_CHECK_FILE($with_beagle/libhmsbeagle/platform.h,,

         [AC_MSG_ERROR([beagle's library include file platform.h is not found neither in 
          ${with_beagle}/include/libhmsbeagle/libhmsbeagle/ nor in 
          ${with_beagle}/include/libhmsbeagle-1/libhmsbeagle/]. You should either install 
          beagle library from http://code.google.com/p/beagle-lib/ or disable use of 
          beagle library by invoking configure script with option --with-beagle=no. 
          Note: without beagle library MrBayes may run slower.)])])
         [AC_MSG_ERROR([beagle's library include file platform.h is not found neither in 
          ${with_beagle}/include/libhmsbeagle/libhmsbeagle/ nor in 
          ${with_beagle}/include/libhmsbeagle-1/libhmsbeagle/]. You should either install 
          beagle library from http://code.google.com/p/beagle-lib/ or disable use of 
          beagle library by invoking configure script with option --with-beagle=no. 
          Note: without beagle library MrBayes may run slower.)])])

+         ])

     AC_CHECK_FILE($with_beagle/lib,[BEAGLE_LIBS="-L$with_beagle/lib -lhmsbeagle"],
     AC_CHECK_FILE($with_beagle/lib,[BEAGLE_LIBS="-L$with_beagle/lib -lhmsbeagle"],

+        [AC_CHECK_FILE($with_beagle/libhmsbeagle/libs,
+        [BEAGLE_LIBS="-L$with_beagle/libhmsbeagle/libs -lhmsbeagle"],

        [AC_MSG_ERROR([beagle library is not found in ${with_beagle}]. You should either 
         install beagle library from http://code.google.com/p/beagle-lib/ or disable use 
         of beagle library by invoking configure script with option --with-beagle=no. 
         Note: without beagle library MrBayes may run slower.)])
        [AC_MSG_ERROR([beagle library is not found in ${with_beagle}]. You should either 
         install beagle library from http://code.google.com/p/beagle-lib/ or disable use 
         of beagle library by invoking configure script with option --with-beagle=no. 
         Note: without beagle library MrBayes may run slower.)])

+        ])

 
     AC_DEFINE(BEAGLE_ENABLED)
     CFLAGS="${CFLAGS} ${BEAGLE_CFLAGS}"
 
     AC_DEFINE(BEAGLE_ENABLED)
     CFLAGS="${CFLAGS} ${BEAGLE_CFLAGS}"