Changeset 2873 for trunk/configure.ac

Timestamp:

Nov 13, 2012, 12:15:37 PM (10 years ago)

Author:

Peter

Message:

prefer using YAT_MSG_ERROR and simplify computation of YAT_PRIMARY_LIBS and YAT_LIBS

File:

• trunk/configure.ac (modified) (7 diffs)

trunk/configure.ac

@@ -61 +61 @@
                   silent-rules subdir-objects])
 
+dnl When fatal error are detected we use macro YAT_MSG_ERROR that
+dnl collects all error messages and aborts configure [just] before
+dnl creating output files with this message below plus collected
+dnl messages from YAT_MSG_ERROR calls.
 YAT_MSG_ERROR_PREPARE([
         Some pre-requisites were not fulfilled, aborting configure.
@@ -201 +205 @@
 AC_MSG_NOTICE([checking for libraries])
 AC_CHECK_LIBM
+LIBS="$LIBS $LIBM"
 
 # find library implementing BLAS C API, or use gslcblas
 YAT_LIB_CBLAS([YAT_CBLAS_LIB=$CBLAS_LIB], [YAT_CBLAS_LIB=-lgslcblas])
+LIBS="$LIBS $YAT_CBLAS_LIB"
 
 # GNU Scientific Library, GSL http://www.gnu.org/software/gsl/, checks
@@ -209 +215 @@
 gsl_version="1.8"
 AC_SUBST(gsl_version)
-gsl_ok=yes
-YAT_CHECK_GSL([$gsl_version],[gsl_ok=yes],[gsl_ok=no])
+YAT_CHECK_GSL([$gsl_version],[LIBS="$LIBS -lgsl"],[YAT_MSG_ERROR([dnl
+GSL $gsl_version (or newer) not found. The GNU Scientific Library
+(GSL) library cannot be found. Please make sure GSL is
+installed. Please refer to warnings above for more details])
+])
 
 # Boost http://www.boost.org
 boost_version=1.35
 AC_SUBST(boost_version)
-AX_BOOST_BASE(["$boost_version"], [boost_ok=yes], [boost_ok=no])
+AX_BOOST_BASE(["$boost_version"], [], [YAT_MSG_ERROR([dnl
+Boost ${boost_version} (or newer) not found. Please install boost, or provide
+CPPFLAGS=-I/path/to/boost])
+])
 # skip boost link tests if boost is not wanted (--without-boost)
 AS_IF([test x"$want_boost" = x"yes"],[
@@ -223 +235 @@
   YAT_LD_ADD_FLAG([LDFLAGS], [$BOOST_LDFLAGS])
   # boost tests above only test compilation, so let's try link in the libs
-  save_LIBS=$LIBS
   LIBS="$LIBS $BOOST_THREAD_LIB $BOOST_SYSTEM_LIB"
   AC_MSG_CHECKING([for thread_specific_ptr])
@@ -231 +242 @@
                  [AC_MSG_RESULT([yes])],
                  [AC_MSG_RESULT([no])
-                  boost_ok=no])
-  LIBS=$save_LIBS
+                  YAT_MSG_ERROR([Boost thread library not found. Please install library boost-thread.])
+                 ])
 ])
 
@@ -377 +388 @@
 # configure is halted prematurely.
 
-# used to trigger exit before creation of output
-all_reqs_ok="true"
-
-# Non-existing GSL is fatal -- sub-sequent compilation will fail.
-if test "x$gsl_ok" != "xyes" ; then
-  all_reqs_ok="false"
-  AC_MSG_WARN([
-  GSL $gsl_version (or newer) not found. The GNU Scientific Library
-  (GSL) library cannot be found. Please make sure GSL is
-  installed. Please refer to warnings above for more details])
-fi
-
-if test "x$want_boost" = "xyes"; then
-# Too old Boost is fatal -- sub-sequent compilation will fail.
-AS_IF([test "${boost_ok}" != "yes"],[
-  all_reqs_ok="false"
-  AC_MSG_WARN([
-  Boost ${boost_version} (or newer) not found. Please make sure Boost
-  is installed.])
-], [
-  AS_IF([test x$ax_cv_boost_thread = xno], [
-    all_reqs_ok="false"
-    AC_MSG_WARN([
-  Boost thread library not found. Please make sure library boost-thread is
-  is installed.])
-  ])
-])
-fi
-
-if (test "$all_reqs_ok" = "false") ; then
-  AC_MSG_FAILURE([
-  Some pre-requisites were not fulfilled, aborting configure.
-  Please consult the 'README' file for more information about what
-  is needed to compile yat and refer to above warning messages.
-  Needed files were NOT created.])
-fi
-
 # Reset flags
 APR_RESTORE_THE_ENVIRONMENT(CPPFLAGS, YAT_)
@@ -420 +394 @@
 APR_RESTORE_THE_ENVIRONMENT(LIBS, YAT_)
 
-YAT_PRIMARY_LIBS="-lgsl $BOOST_THREAD_LIB $BOOST_SYSTEM_LIB"
-YAT_LIBS="$YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM"
+# YAT_LIBS minus cblas and math libraries
+YAT_PRIMARY_LIBS=
+for lib in $YAT_LIBS; do
+  AS_CASE([$lib], [$YAT_CBLAS_LIB], [],
+          [$LIBM], [],
+          [YAT_PRIMARY_LIBS="$YAT_PRIMARY_LIBS $lib"])
+done
 AC_SUBST(YAT_PRIMARY_LIBS)
 AC_SUBST(YAT_LIBS)