Changeset 73aa7bf6 in tol

Timestamp:

May 22, 2011, 8:44:42 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

3f32a91

Parents:

b0a03cb

Message:

refs #1211, the configure now look for libtol.so

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3571 be4846ae-f051-483a-831f-b64e7d08527f

Location:

toltcl

Files:

• configure (modified) (5 diffs)
• configure.in (modified) (1 diff)

toltcl/configure

@@ -11094 +11094 @@
 
     if test "x${tol_dir}" != "x" ; then
-      { $as_echo "$as_me:$LINENO: checking for libtol2.0.2.so in ${tol_dir}/lib" >&5
-$as_echo_n "checking for libtol2.0.2.so in ${tol_dir}/lib... " >&6; }
-      if test -r "${tol_dir}/lib/libtol2.0.2.so" ; then
+      { $as_echo "$as_me:$LINENO: checking for libtol.so in ${tol_dir}/lib" >&5
+$as_echo_n "checking for libtol.so in ${tol_dir}/lib... " >&6; }
+      if test -r "${tol_dir}/lib/libtol.so" ; then
         tol_LIB_DIR="${tol_dir}/lib"
         ac_cv_lib_tol=yes
@@ -11106 +11106 @@
       fi
     elif test "x${tol_lib_dir}" != "x" ; then
-      { $as_echo "$as_me:$LINENO: checking for libtol2.0.2.so in tol_dir/lib" >&5
-$as_echo_n "checking for libtol2.0.2.so in tol_dir/lib... " >&6; }
-      if test -r "${tol_lib_dir}/libtol2.0.2.so" ; then
+      { $as_echo "$as_me:$LINENO: checking for libtol.so in tol_dir/lib" >&5
+$as_echo_n "checking for libtol.so in tol_dir/lib... " >&6; }
+      if test -r "${tol_lib_dir}/libtol.so" ; then
         tol_LIB_DIR="${tol_lib_dir}"
         ac_cv_lib_tol=yes
@@ -11118 +11118 @@
       fi
     else
-      { $as_echo "$as_me:$LINENO: checking for libtol2.0.2.so" >&5
-$as_echo_n "checking for libtol2.0.2.so... " >&6; }
+      { $as_echo "$as_me:$LINENO: checking for libtol.so" >&5
+$as_echo_n "checking for libtol.so... " >&6; }
       for dir in /usr/local/lib /usr/local /usr/lib /usr
       do
-        if test -r "${dir}/libtol2.0.2.so" ; then
+        if test -r "${dir}/libtol.so" ; then
           tol_LIB_DIR="${dir}"
           ac_cv_lib_tol=yes
@@ -11141 +11141 @@
 
   if test "${ac_cv_lib_tol}" != "yes" ; then
-    { { $as_echo "$as_me:$LINENO: error: Cannot find library libtol2.0.2.so (package: TOL Language)" >&5
-$as_echo "$as_me: error: Cannot find library libtol2.0.2.so (package: TOL Language)" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Cannot find library libtol.so (package: TOL Language)" >&5
+$as_echo "$as_me: error: Cannot find library libtol.so (package: TOL Language)" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -11234 +11234 @@
 
 
-    vars="-ltol2.0.2"
+    vars="-ltol"
     for i in $vars; do
         if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then

toltcl/configure.in

@@ -169 +169 @@
 
 TOLTCL_REQUIRE_PACKAGE([gsl],[GNU Scientific Library],[gsl/gsl_errno.h],[gsl])
-TOLTCL_REQUIRE_PACKAGE([tol],[TOL Language],[tol/tol_bcommon.h],[tol2.0.2])
+TOLTCL_REQUIRE_PACKAGE([tol],[TOL Language],[tol/tol_bcommon.h],[tol])
 TOLTCL_REQUIRE_PACKAGE([readline],[Readline],[readline/readline.h],[readline])