Fix check for shared library using libtool info, instead of assuming extension

being ".so".  (closes: FRBug#121)

diff --git a/aclocal.m4 b/aclocal.m4
index 39c1d59..b4afd00 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -589,7 +589,7 @@ else
 fi
 dnl If we have a local install path, check for some files
 if test $PGROOT && test IS_LOCAL ; then
-       if test -e $PGROOT/lib/libpq.so ; then
+       if test -e $PGROOT/lib/libpq${libltdl_cv_shlibext} ; then
                if test -e $PGROOT/lib/libpq.a ; then
                        PQ_LIBS="-L$PGROOT/lib -lpq"
                fi
@@ -686,7 +686,7 @@ dnl #  Look for it in a number of directories.
 dnl #
   old_LIBS="$LIBS"
 
-  AC_LOCATE_DIR(odbc_lib_dir, [libodbcclient.so])
+  AC_LOCATE_DIR(odbc_lib_dir, [libodbcclient${libltdl_cv_shlibext}])
   AC_LOCATE_DIR(odbc_lib_dir, [libodbcclient.a])
 
   for try in /usr/lib /usr/lib/odbc /usr/local/lib/odbc /usr/local/odbc/lib $odbc_lib_dir; do
@@ -1002,7 +1002,7 @@ dnl #
              smart_lib="-l$1")
 
   if test "x$smart_lib" = "x"; then
-    AC_LOCATE_DIR(smart_lib_dir,[lib$1.so])
+    AC_LOCATE_DIR(smart_lib_dir,[lib$1${libltdl_cv_shlibext}])
     AC_LOCATE_DIR(smart_lib_dir,[lib$1.a])
 
     for try in $smart_lib_dir /usr/local/lib/ /opt/lib; do

diff --git a/configure b/configure
index 96a6f45..0558bdc 100755 (executable)
--- a/configure
+++ b/configure
@@ -560,7 +560,7 @@ fi
 
 
 
-# From configure.in Revision: 1.118 
+# From configure.in Revision: 1.119 
 RADIUSD_VERSION=0.1
 
 
@@ -3962,7 +3962,7 @@ else
        fi
 fi
 if test $PGROOT && test IS_LOCAL ; then
-       if test -e $PGROOT/lib/libpq.so ; then
+       if test -e $PGROOT/lib/libpq${libltdl_cv_shlibext} ; then
                if test -e $PGROOT/lib/libpq.a ; then
                        PQ_LIBS="-L$PGROOT/lib -lpq"
                fi
@@ -4248,7 +4248,7 @@ echo "configure:4244: checking for odbc_init in -lodbcclient" >&5
 
 if test "x$LOCATE" != "x"; then
         DIRS=
-  file=libodbcclient.so
+  file=libodbcclient${libltdl_cv_shlibext}
 
   for x in `${LOCATE} $file 2>/dev/null`; do
                                         base=`echo $x | sed "s%/${file}%%"`
@@ -4346,6 +4346,7 @@ LIBTOOL="`pwd`/libtool"
 top_builddir=`pwd`
 
 
+
 if test "$WITH_THREAD_POOL" = "yes"; then
         if test "$WITH_THREADS" != "yes"; then
     { echo "configure: error: You must have threads enabled for thread pools to work." 1>&2; exit 1; }

diff --git a/configure.in b/configure.in
index 041039a..6e99a15 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -598,6 +598,8 @@ AC_SUBST(INCLTDL)
 top_builddir=`pwd`
 AC_SUBST(top_builddir)
 
+dnl import libtool stuff
+
 dnl #
 dnl #  Checks to ensure that the thread pool code can build.
 dnl #