using libs extensions from confflu_check _os

alexey4petrov · Jan 14, 2012 · dda31aa · dda31aa
1 parent 4aeb631
commit dda31aa
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 13 deletions.
diff --git a/admin/confflu_check_blockfvmatrixlib.m4 b/admin/confflu_check_blockfvmatrixlib.m4
@@ -27,6 +27,7 @@ AC_DEFUN([CONFFLU_CHECK_BLOCKFVMATRIXLIB],dnl
 AC_CHECKING(for blockFvMatrixLib package)
 
 AC_REQUIRE([CONFFLU_CHECK_BLOCKLDUMATRIXLIB])
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -61,7 +62,7 @@ if test ! "x${withval}" = "xno" ; then
    fi
 
    AC_CHECK_FILE( [${blockfvmatrixlib_root_dir}/lnInclude], [ blockfvmatrixlib_ok=yes ], [ blockfvmatrixlib_ok=no ] )
-   AC_CHECK_FILE( [${blockfvmatrixlib_root_dir}/lib/libblockFvMatrix.so], [ blockfvmatrixlib_ok=yes ], [ blockfvmatrixlib_ok=no ] )
+   AC_CHECK_FILE( [${blockfvmatrixlib_root_dir}/lib/libblockFvMatrix.${LIB_EXTENSION}], [ blockfvmatrixlib_ok=yes ], [ blockfvmatrixlib_ok=no ] )
 
    if test "x${blockfvmatrixlib_ok}" = "xyes" ; then
       BLOCKFVMATRIXLIB_CPPFLAGS="${BLOCKFVMATRIXLIB_CPPFLAGS} -I${blockfvmatrixlib_root_dir}/lnInclude"

diff --git a/admin/confflu_check_blockldumatrixlib.m4 b/admin/confflu_check_blockldumatrixlib.m4
@@ -27,6 +27,7 @@ AC_DEFUN([CONFFLU_CHECK_BLOCKLDUMATRIXLIB],dnl
 AC_CHECKING(for blockLduMatrixLib package)
 
 AC_REQUIRE([CONFFLU_CHECK_OPENFOAM])
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -61,7 +62,7 @@ if test ! "x${withval}" = "xno" ; then
    fi
 
    AC_CHECK_FILE( [${blockldumatrixlib_root_dir}/lnInclude], [ blockldumatrixlib_ok=yes ], [ blockldumatrixlib_ok=no ] )
-   AC_CHECK_FILE( [${blockldumatrixlib_root_dir}/lib/libblockLduMatrix.so], [ blockldumatrixlib_ok=yes ], [ blockldumatrixlib_ok=no ] )
+   AC_CHECK_FILE( [${blockldumatrixlib_root_dir}/lib/libblockLduMatrix.${LIB_EXTENSION}], [ blockldumatrixlib_ok=yes ], [ blockldumatrixlib_ok=no ] )
 
    if test "x${blockldumatrixlib_ok}" = "xyes" ; then
       BLOCKLDUMATRIXLIB_CPPFLAGS="-I${blockldumatrixlib_root_dir}/lnInclude"

diff --git a/admin/confflu_check_boost_program_options.m4 b/admin/confflu_check_boost_program_options.m4
@@ -28,6 +28,7 @@ AC_DEFUN([CONFFLU_CHECK_BOOST_PROGRAM_OPTIONS],
 AC_CHECKING(for Boost "program_options" library)
 
 AC_REQUIRE([CONFFLU_CHECK_BOOST])
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -54,7 +55,7 @@ fi
 dnl --------------------------------------------------------------------------------
 dnl Check for Boost "program_options" library
 if test "x${boost_program_options_ok}" = "xyes" ; then
-   AC_CHECK_FILE( [${with_boost_libraries}/libboost_program_options${BOOST_LIBSUFFIX}.so], [ boost_program_options_ok=yes ], [ boost_program_options_ok=no ] )
+   AC_CHECK_FILE( [${with_boost_libraries}/libboost_program_options${BOOST_LIBSUFFIX}.${LIB_EXTENSION}], [ boost_program_options_ok=yes ], [ boost_program_options_ok=no ] )
 fi
 
 if test "x${boost_program_options_ok}" = "xyes" ; then

diff --git a/admin/confflu_check_boost_serialization.m4 b/admin/confflu_check_boost_serialization.m4
@@ -28,6 +28,7 @@ AC_DEFUN([CONFFLU_CHECK_BOOST_SERIALIZATION],
 AC_CHECKING(for Boost "serialization" library)
 
 AC_REQUIRE([CONFFLU_CHECK_BOOST])
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -52,7 +53,7 @@ fi
 dnl --------------------------------------------------------------------------------
 dnl Check for Boost "serialization" library
 if test "x${boost_serialization_ok}" = "xyes" ; then
-   AC_CHECK_FILE( [${with_boost_libraries}/libboost_serialization${BOOST_LIBSUFFIX}.so], [ boost_serialization_ok=yes ], [ boost_serialization_ok=no ] )
+   AC_CHECK_FILE( [${with_boost_libraries}/libboost_serialization${BOOST_LIBSUFFIX}.${LIB_EXTENSION}], [ boost_serialization_ok=yes ], [ boost_serialization_ok=no ] )
 fi
 
 dnl --------------------------------------------------------------------------------

diff --git a/admin/confflu_check_boost_thread.m4 b/admin/confflu_check_boost_thread.m4
@@ -28,6 +28,7 @@ AC_DEFUN([CONFFLU_CHECK_BOOST_THREAD],
 AC_CHECKING(for Boost "thread" library)
 
 AC_REQUIRE([CONFFLU_CHECK_BOOST])
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -54,7 +55,7 @@ fi
 dnl --------------------------------------------------------------------------------
 dnl Check for Boost "thread" library
 if test "x${boost_thread_ok}" = "xyes" ; then
-   AC_CHECK_FILE( [${with_boost_libraries}/libboost_thread${BOOST_LIBSUFFIX}.so], [ boost_thread_ok=yes ], [ boost_thread_ok=no ] )
+   AC_CHECK_FILE( [${with_boost_libraries}/libboost_thread${BOOST_LIBSUFFIX}.${LIB_EXTENSION}], [ boost_thread_ok=yes ], [ boost_thread_ok=no ] )
 fi
 
 if test "x${boost_thread_ok}" = "xyes" ; then

diff --git a/admin/confflu_check_diffusionfoamlib.m4 b/admin/confflu_check_diffusionfoamlib.m4
@@ -27,6 +27,7 @@ AC_DEFUN([CONFFLU_CHECK_DIFFUSIONFOAMLIB],dnl
 AC_CHECKING(for diffusionFoamLib package)
 
 AC_REQUIRE([CONFFLU_CHECK_BLOCKFVMATRIXLIB])
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -61,7 +62,7 @@ if test ! "x${withval}" = "xno" ; then
    fi
 
    AC_CHECK_FILE( [${diffusionfoamlib_root_dir}/lnInclude], [ diffusionfoamlib_ok=yes ], [ diffusionfoamlib_ok=no ] )
-   AC_CHECK_FILE( [${diffusionfoamlib_root_dir}/lib/libdiffusionFoam.so], [ diffusionfoamlib_ok=yes ], [ diffusionfoamlib_ok=no ] )
+   AC_CHECK_FILE( [${diffusionfoamlib_root_dir}/lib/libdiffusionFoam.${LIB_EXTENSION}], [ diffusionfoamlib_ok=yes ], [ diffusionfoamlib_ok=no ] )
 
    if test "x${diffusionfoamlib_ok}" = "xyes" ; then
       DIFFUSIONFOAMLIB_CPPFLAGS="${DIFFUSIONFOAMLIB_CPPFLAGS} -I${diffusionfoamlib_root_dir}/lnInclude"

diff --git a/admin/confflu_check_hdf5.m4 b/admin/confflu_check_hdf5.m4
@@ -25,6 +25,7 @@ dnl ----------------------------------------------------------------------------
 AC_DEFUN([CONFFLU_CHECK_HDF5],
 [
 AC_CHECKING(for HDF5 environemnt)
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG([C])
@@ -91,12 +92,12 @@ AC_ARG_WITH( [hdf5_libraries],
    
 if test "x${with_hdf5_libraries}" = "xno" ; then
    with_hdf5_libraries=${hdf5_home}/lib
-   AC_CHECK_FILE( [${with_hdf5_libraries}/libhdf5.so], [ hdf5_libraries_ok=yes ], [ hdf5_libraries_ok=no ] )
+   AC_CHECK_FILE( [${with_hdf5_libraries}/libhdf5.${LIB_EXTENSION}], [ hdf5_libraries_ok=yes ], [ hdf5_libraries_ok=no ] )
 fi
 
 if test "x${hdf5_libraries_ok}" = "xno" ; then
    with_hdf5_libraries=/usr/lib
-   AC_CHECK_FILE( [${with_hdf5_libraries}/libhdf5.so], [ hdf5_libraries_ok=yes ], [ hdf5_libraries_ok=no ] )
+   AC_CHECK_FILE( [${with_hdf5_libraries}/libhdf5.${LIB_EXTENSION}], [ hdf5_libraries_ok=yes ], [ hdf5_libraries_ok=no ] )
 fi
 
 

diff --git a/admin/confflu_check_loki.m4 b/admin/confflu_check_loki.m4
@@ -25,6 +25,7 @@ dnl ----------------------------------------------------------------------------
 AC_DEFUN([CONFFLU_CHECK_LOKI],dnl
 [
 AC_CHECKING(for Loki Library)
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -88,12 +89,12 @@ AC_ARG_WITH( [loki_libraries],
    
 if test "x${with_loki_libraries}" = "xno" && test ! "x${LOKI_ROOT_DIR}" = "x" ; then
    with_loki_libraries=${LOKI_ROOT_DIR}/lib
-   AC_CHECK_FILE( [${with_loki_libraries}/libloki.so], [ loki_libraries_ok=yes ], [ loki_libraries_ok=no ] )
+   AC_CHECK_FILE( [${with_loki_libraries}/libloki.${LIB_EXTENSION}], [ loki_libraries_ok=yes ], [ loki_libraries_ok=no ] )
 fi
 
 if test "x${vtk_libraries_ok}" = "xno" ; then
    with_loki_libraries="/usr/lib"
-   AC_CHECK_FILE( [${with_loki_libraries}/libloki.so], [ loki_libraries_ok=yes ], [ loki_libraries_ok=no ] )
+   AC_CHECK_FILE( [${with_loki_libraries}/libloki.${LIB_EXTENSION}], [ loki_libraries_ok=yes ], [ loki_libraries_ok=no ] )
 fi
 
 if test "x${loki_libraries_ok}" = "xyes" ; then

diff --git a/admin/confflu_check_parafoam.m4 b/admin/confflu_check_parafoam.m4
@@ -32,6 +32,7 @@ AC_REQUIRE([CONFFLU_CHECK_BOOST_THREAD])
 
 AC_REQUIRE([CONFFLU_CHECK_OPENFOAM])
 AC_REQUIRE([CONFFLU_CHECK_DIFFUSIONFOAMLIB])
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_SUBST(ENABLE_PARAFOAM)
 
@@ -56,7 +57,7 @@ if test "x${withval}" = "xno" ; then
 fi
 
 dnl --------------------------------------------------------------------------------
-AC_CHECK_FILE( [${parafoam_root_dir}/lib/libparallel_threading_base.so], [ parafoam_ok=yes ], [ parafoam_ok=no ] )
+AC_CHECK_FILE( [${parafoam_root_dir}/lib/libparallel_threading_base.${LIB_EXTENSION}], [ parafoam_ok=yes ], [ parafoam_ok=no ] )
 
 dnl --------------------------------------------------------------------------------
 if test "x${parafoam_ok}" = "xno" ; then

diff --git a/admin/confflu_check_vtk.m4 b/admin/confflu_check_vtk.m4
@@ -25,6 +25,7 @@ dnl ----------------------------------------------------------------------------
 AC_DEFUN([CONFFLU_CHECK_VTK],dnl
 [
 AC_CHECKING(for VTK Library)
+AC_REQUIRE([CONFFLU_CHECK_OS])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -84,12 +85,12 @@ AC_ARG_WITH( [vtk_libraries],
    
 if test "x${with_vtk_libraries}" = "xno" && test ! "x${VTKHOME}" = "x" ; then
    with_vtk_libraries=${VTKHOME}/lib
-   AC_CHECK_FILE( [${with_vtk_libraries}/libvtkCommon.so], [ vtk_libraries_ok=yes ], [ vtk_libraries_ok=no ] )
+   AC_CHECK_FILE( [${with_vtk_libraries}/libvtkCommon.${LIB_EXTENSION}], [ vtk_libraries_ok=yes ], [ vtk_libraries_ok=no ] )
 fi
 
 if test "x${vtk_libraries_ok}" = "xno" ; then
    with_vtk_libraries=/usr/lib
-   AC_CHECK_FILE( [${with_vtk_libraries}/libvtkCommon.so], [ vtk_libraries_ok=yes ], [ vtk_libraries_ok=no ] )
+   AC_CHECK_FILE( [${with_vtk_libraries}/libvtkCommon.${LIB_EXTENSION}], [ vtk_libraries_ok=yes ], [ vtk_libraries_ok=no ] )
 fi
 
 if test "x${vtk_libraries_ok}" = "xyes" ; then