Regenerate after changes to aclocal.m4
authornbk <nbk>
Fri, 19 Aug 2005 19:09:32 +0000 (19:09 +0000)
committernbk <nbk>
Fri, 19 Aug 2005 19:09:32 +0000 (19:09 +0000)
src/modules/rlm_counter/configure
src/modules/rlm_dbm/configure
src/modules/rlm_eap/types/rlm_eap_peap/configure
src/modules/rlm_eap/types/rlm_eap_sim/configure
src/modules/rlm_eap/types/rlm_eap_tls/configure
src/modules/rlm_eap/types/rlm_eap_ttls/configure
src/modules/rlm_ippool/configure
src/modules/rlm_krb5/configure
src/modules/rlm_perl/configure
src/modules/rlm_python/configure
src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure

index 1f87747..d238d36 100755 (executable)
@@ -835,12 +835,42 @@ ac_safe=`echo "gdbm.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6
 echo "configure:837: checking for gdbm.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 847 "configure"
+#include "confdefs.h"
+
+                   #include <gdbm.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 844 "configure"
+#line 874 "configure"
 #include "confdefs.h"
 
                  #include <gdbm.h>
@@ -848,7 +878,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -858,9 +888,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -888,19 +919,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 896 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 926 "configure"
 #include "confdefs.h"
 
-                      #include <gdbm.h>
+                   #include <gdbm.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -910,21 +940,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        
@@ -932,22 +961,49 @@ fi
 sm_lib_safe=`echo "gdbm" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "gdbm_open" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:936: checking for gdbm_open in -lgdbm" >&5
+echo "configure:965: checking for gdbm_open in -lgdbm" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lgdbm"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lgdbm $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 975 "configure"
+#include "confdefs.h"
+extern char gdbm_open();
+int main() {
+ gdbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lgdbm"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lgdbm $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 944 "configure"
+#line 1000 "configure"
 #include "confdefs.h"
 extern char gdbm_open();
 int main() {
  gdbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lgdbm"
 else
@@ -955,9 +1011,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -984,7 +1042,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1012,18 +1070,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lgdbm"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1020 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lgdbm $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1077 "configure"
 #include "confdefs.h"
 extern char gdbm_open();
 int main() {
  gdbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lgdbm"
 else
@@ -1031,20 +1088,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_lib_gdbm_gdbm_open" != "xyes"; then
@@ -1053,9 +1110,9 @@ fi
 
        if test "x$fail" = "x"; then
                echo $ac_n "checking to see GDBM_SYNC status""... $ac_c" 1>&6
-echo "configure:1057: checking to see GDBM_SYNC status" >&5
+echo "configure:1114: checking to see GDBM_SYNC status" >&5
                cat > conftest.$ac_ext <<EOF
-#line 1059 "configure"
+#line 1116 "configure"
 #include "confdefs.h"
 
 #include <gdbm.h>
@@ -1090,12 +1147,12 @@ rm -f conftest*
        old_LIBS=$LIBS
        LIBS="$LIBS $SMART_LIBS"
        echo $ac_n "checking for gdbm_fdesc""... $ac_c" 1>&6
-echo "configure:1094: checking for gdbm_fdesc" >&5
+echo "configure:1151: checking for gdbm_fdesc" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gdbm_fdesc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1099 "configure"
+#line 1156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gdbm_fdesc(); below.  */
@@ -1118,7 +1175,7 @@ gdbm_fdesc();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gdbm_fdesc=yes"
 else
index 7a85235..670c75e 100755 (executable)
@@ -876,12 +876,42 @@ ac_safe=`echo "ndbm.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
 echo "configure:878: checking for ndbm.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 888 "configure"
+#include "confdefs.h"
+
+                   #include <ndbm.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 885 "configure"
+#line 915 "configure"
 #include "confdefs.h"
 
                  #include <ndbm.h>
@@ -889,7 +919,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -899,9 +929,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -929,19 +960,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 937 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 967 "configure"
 #include "confdefs.h"
 
-                      #include <ndbm.h>
+                   #include <ndbm.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -951,21 +981,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_header_ndbm_h" = "xyes"; then
@@ -975,14 +1004,44 @@ fi
 
 ac_safe=`echo "gdbm/ndbm.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for gdbm/ndbm.h""... $ac_c" 1>&6
-echo "configure:979: checking for gdbm/ndbm.h" >&5
+echo "configure:1008: checking for gdbm/ndbm.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 1018 "configure"
+#include "confdefs.h"
+
+                   #include <gdbm/ndbm.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:1026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 986 "configure"
+#line 1045 "configure"
 #include "confdefs.h"
 
                  #include <gdbm/ndbm.h>
@@ -990,7 +1049,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -1000,9 +1059,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1030,19 +1090,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1038 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 1097 "configure"
 #include "confdefs.h"
 
-                      #include <gdbm/ndbm.h>
+                   #include <gdbm/ndbm.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -1052,21 +1111,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
                if test "x$ac_cv_header_gdbm_ndbm_h" = "xyes"; then
@@ -1077,14 +1135,44 @@ fi
 
 ac_safe=`echo "gdbm-ndbm.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for gdbm-ndbm.h""... $ac_c" 1>&6
-echo "configure:1081: checking for gdbm-ndbm.h" >&5
+echo "configure:1139: checking for gdbm-ndbm.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 1149 "configure"
+#include "confdefs.h"
+
+                   #include <gdbm-ndbm.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:1157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 1088 "configure"
+#line 1176 "configure"
 #include "confdefs.h"
 
                  #include <gdbm-ndbm.h>
@@ -1092,7 +1180,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -1102,9 +1190,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1132,19 +1221,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1140 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 1228 "configure"
 #include "confdefs.h"
 
-                      #include <gdbm-ndbm.h>
+                   #include <gdbm-ndbm.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -1154,21 +1242,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
                        if test "x$ac_cv_header_gdbmmndbm_h" = "xyes"; then
@@ -1179,16 +1266,16 @@ fi
                fi
        fi
        echo $ac_n "checking for dbm in default lib""... $ac_c" 1>&6
-echo "configure:1183: checking for dbm in default lib" >&5
+echo "configure:1270: checking for dbm in default lib" >&5
        cat > conftest.$ac_ext <<EOF
-#line 1185 "configure"
+#line 1272 "configure"
 #include "confdefs.h"
 extern void* dbm_open();
 int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_default_dbm_open=yes
                echo "$ac_t""yes" 1>&6
@@ -1206,22 +1293,49 @@ rm -f conftest*
 sm_lib_safe=`echo "ndbm" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "dbm_open" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
-echo "configure:1210: checking for dbm_open in -lndbm" >&5
+echo "configure:1297: checking for dbm_open in -lndbm" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lndbm"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lndbm $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1307 "configure"
+#include "confdefs.h"
+extern char dbm_open();
+int main() {
+ dbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:1314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lndbm"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lndbm $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1218 "configure"
+#line 1332 "configure"
 #include "confdefs.h"
 extern char dbm_open();
 int main() {
  dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lndbm"
 else
@@ -1229,9 +1343,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1258,7 +1374,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1286,18 +1402,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lndbm"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1294 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lndbm $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1409 "configure"
 #include "confdefs.h"
 extern char dbm_open();
 int main() {
  dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lndbm"
 else
@@ -1305,20 +1420,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
                if test "x$ac_cv_lib_ndbm_dbm_open" != "xyes"; then
@@ -1327,22 +1442,49 @@ fi
 sm_lib_safe=`echo "gdbm" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "dbm_open" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:1331: checking for dbm_open in -lgdbm" >&5
+echo "configure:1446: checking for dbm_open in -lgdbm" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lgdbm"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lgdbm $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1456 "configure"
+#include "confdefs.h"
+extern char dbm_open();
+int main() {
+ dbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:1463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lgdbm"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lgdbm $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1339 "configure"
+#line 1481 "configure"
 #include "confdefs.h"
 extern char dbm_open();
 int main() {
  dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lgdbm"
 else
@@ -1350,9 +1492,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1379,7 +1523,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1407,18 +1551,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lgdbm"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1415 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lgdbm $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1558 "configure"
 #include "confdefs.h"
 extern char dbm_open();
 int main() {
  dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lgdbm"
 else
@@ -1426,20 +1569,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
                        if test "x$ac_cv_lib_gdbm_dbm_open" != "xyes"; then
@@ -1448,22 +1591,49 @@ fi
 sm_lib_safe=`echo "gdbm_compat" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "dbm_open" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dbm_open in -lgdbm_compat""... $ac_c" 1>&6
-echo "configure:1452: checking for dbm_open in -lgdbm_compat" >&5
+echo "configure:1595: checking for dbm_open in -lgdbm_compat" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lgdbm_compat"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lgdbm_compat $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1605 "configure"
+#include "confdefs.h"
+extern char dbm_open();
+int main() {
+ dbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:1612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lgdbm_compat"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lgdbm_compat $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1460 "configure"
+#line 1630 "configure"
 #include "confdefs.h"
 extern char dbm_open();
 int main() {
  dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lgdbm_compat"
 else
@@ -1471,9 +1641,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1500,7 +1672,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1528,18 +1700,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lgdbm_compat"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1536 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lgdbm_compat $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1707 "configure"
 #include "confdefs.h"
 extern char dbm_open();
 int main() {
  dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lgdbm_compat"
 else
@@ -1547,20 +1718,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
                                if test "x$ac_cv_lib_gdbm_compat_dbm_open" != "xyes"; then
index b7828ad..0603937 100755 (executable)
@@ -829,12 +829,42 @@ ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6
 echo "configure:831: checking for openssl/ssl.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 841 "configure"
+#include "confdefs.h"
+
+                   #include <openssl/ssl.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 838 "configure"
+#line 868 "configure"
 #include "confdefs.h"
 
                  #include <openssl/ssl.h>
@@ -842,7 +872,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -852,9 +882,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -882,19 +913,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 890 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 920 "configure"
 #include "confdefs.h"
 
-                      #include <openssl/ssl.h>
+                   #include <openssl/ssl.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -904,21 +934,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_header_openssl_ssl_h" != "xyes"; then
@@ -931,22 +960,49 @@ fi
 sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6
-echo "configure:935: checking for DH_new in -lcrypto" >&5
+echo "configure:964: checking for DH_new in -lcrypto" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lcrypto"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 974 "configure"
+#include "confdefs.h"
+extern char DH_new();
+int main() {
+ DH_new()
+; return 0; }
+EOF
+if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lcrypto"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lcrypto $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 943 "configure"
+#line 999 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lcrypto"
 else
@@ -954,9 +1010,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -983,7 +1041,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1011,18 +1069,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lcrypto"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1019 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1076 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lcrypto"
 else
@@ -1030,20 +1087,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test "x$ac_cv_lib_crypto_DH_new" != "xyes"; then
@@ -1055,22 +1112,49 @@ fi
 sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:1059: checking for SSL_new in -lssl" >&5
+echo "configure:1116: checking for SSL_new in -lssl" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lssl"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lssl $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1126 "configure"
+#include "confdefs.h"
+extern char SSL_new();
+int main() {
+ SSL_new()
+; return 0; }
+EOF
+if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lssl"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lssl $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1067 "configure"
+#line 1151 "configure"
 #include "confdefs.h"
 extern char SSL_new();
 int main() {
  SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lssl"
 else
@@ -1078,9 +1162,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1107,7 +1193,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1135,18 +1221,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lssl"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1143 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lssl $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1228 "configure"
 #include "confdefs.h"
 extern char SSL_new();
 int main() {
  SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lssl"
 else
@@ -1154,20 +1239,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test "x$ac_cv_lib_ssl_SSL_new" != "xyes"; then
@@ -1175,7 +1260,7 @@ fi
     fi
 
        echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1179: checking how to run the C preprocessor" >&5
+echo "configure:1264: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1190,13 +1275,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1194 "configure"
+#line 1279 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1207,13 +1292,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1296 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1224,13 +1309,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1228 "configure"
+#line 1313 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1261,17 +1346,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1265: checking for $ac_hdr" >&5
+echo "configure:1350: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1270 "configure"
+#line 1355 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
index 988617f..96e19c5 100644 (file)
@@ -789,12 +789,42 @@ ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6
 echo "configure:791: checking for openssl/ssl.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 801 "configure"
+#include "confdefs.h"
+
+                   #include <openssl/ssl.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 798 "configure"
+#line 828 "configure"
 #include "confdefs.h"
 
                  #include <openssl/ssl.h>
@@ -802,7 +832,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -812,9 +842,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -842,19 +873,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 850 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 880 "configure"
 #include "confdefs.h"
 
-                      #include <openssl/ssl.h>
+                   #include <openssl/ssl.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -864,21 +894,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_header_openssl_ssl_h" != "xyes"; then
@@ -891,22 +920,49 @@ fi
 sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6
-echo "configure:895: checking for DH_new in -lcrypto" >&5
+echo "configure:924: checking for DH_new in -lcrypto" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lcrypto"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 934 "configure"
+#include "confdefs.h"
+extern char DH_new();
+int main() {
+ DH_new()
+; return 0; }
+EOF
+if { (eval echo configure:941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lcrypto"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lcrypto $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 903 "configure"
+#line 959 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lcrypto"
 else
@@ -914,9 +970,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -943,7 +1001,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -971,18 +1029,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lcrypto"
-
-      cat > conftest.$ac_ext <<EOF
-#line 979 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1036 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lcrypto"
 else
@@ -990,20 +1047,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test "x$ac_cv_lib_crypto_DH_new" != "xyes"; then
@@ -1015,22 +1072,49 @@ fi
 sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:1019: checking for SSL_new in -lssl" >&5
+echo "configure:1076: checking for SSL_new in -lssl" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lssl"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lssl $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1086 "configure"
+#include "confdefs.h"
+extern char SSL_new();
+int main() {
+ SSL_new()
+; return 0; }
+EOF
+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lssl"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lssl $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1027 "configure"
+#line 1111 "configure"
 #include "confdefs.h"
 extern char SSL_new();
 int main() {
  SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lssl"
 else
@@ -1038,9 +1122,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1067,7 +1153,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1095,18 +1181,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lssl"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1103 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lssl $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1188 "configure"
 #include "confdefs.h"
 extern char SSL_new();
 int main() {
  SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lssl"
 else
@@ -1114,20 +1199,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test "x$ac_cv_lib_ssl_SSL_new" != "xyes"; then
@@ -1135,7 +1220,7 @@ fi
     fi
 
        echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1139: checking how to run the C preprocessor" >&5
+echo "configure:1224: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1150,13 +1235,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1154 "configure"
+#line 1239 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1167,13 +1252,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1171 "configure"
+#line 1256 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1184,13 +1269,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1188 "configure"
+#line 1273 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1221,17 +1306,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1225: checking for $ac_hdr" >&5
+echo "configure:1310: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1230 "configure"
+#line 1315 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
index da8c4b3..99eda7f 100755 (executable)
@@ -789,12 +789,42 @@ ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6
 echo "configure:791: checking for openssl/ssl.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 801 "configure"
+#include "confdefs.h"
+
+                   #include <openssl/ssl.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 798 "configure"
+#line 828 "configure"
 #include "confdefs.h"
 
                  #include <openssl/ssl.h>
@@ -802,7 +832,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -812,9 +842,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -842,19 +873,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 850 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 880 "configure"
 #include "confdefs.h"
 
-                      #include <openssl/ssl.h>
+                   #include <openssl/ssl.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -864,21 +894,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_header_openssl_ssl_h" != "xyes"; then
@@ -891,22 +920,49 @@ fi
 sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6
-echo "configure:895: checking for DH_new in -lcrypto" >&5
+echo "configure:924: checking for DH_new in -lcrypto" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lcrypto"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 934 "configure"
+#include "confdefs.h"
+extern char DH_new();
+int main() {
+ DH_new()
+; return 0; }
+EOF
+if { (eval echo configure:941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lcrypto"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lcrypto $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 903 "configure"
+#line 959 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lcrypto"
 else
@@ -914,9 +970,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -943,7 +1001,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -971,18 +1029,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lcrypto"
-
-      cat > conftest.$ac_ext <<EOF
-#line 979 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1036 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lcrypto"
 else
@@ -990,20 +1047,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test "x$ac_cv_lib_crypto_DH_new" != "xyes"; then
@@ -1015,22 +1072,49 @@ fi
 sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:1019: checking for SSL_new in -lssl" >&5
+echo "configure:1076: checking for SSL_new in -lssl" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lssl"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lssl $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1086 "configure"
+#include "confdefs.h"
+extern char SSL_new();
+int main() {
+ SSL_new()
+; return 0; }
+EOF
+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lssl"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lssl $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1027 "configure"
+#line 1111 "configure"
 #include "confdefs.h"
 extern char SSL_new();
 int main() {
  SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lssl"
 else
@@ -1038,9 +1122,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1067,7 +1153,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1095,18 +1181,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lssl"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1103 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lssl $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1188 "configure"
 #include "confdefs.h"
 extern char SSL_new();
 int main() {
  SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lssl"
 else
@@ -1114,20 +1199,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test "x$ac_cv_lib_ssl_SSL_new" != "xyes"; then
@@ -1135,7 +1220,7 @@ fi
     fi
 
        echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1139: checking how to run the C preprocessor" >&5
+echo "configure:1224: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1150,13 +1235,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1154 "configure"
+#line 1239 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1167,13 +1252,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1171 "configure"
+#line 1256 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1184,13 +1269,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1188 "configure"
+#line 1273 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1221,17 +1306,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1225: checking for $ac_hdr" >&5
+echo "configure:1310: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1230 "configure"
+#line 1315 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
index 5bb5621..d9a6e78 100755 (executable)
@@ -789,12 +789,42 @@ ac_safe=`echo "openssl/ssl.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for openssl/ssl.h""... $ac_c" 1>&6
 echo "configure:791: checking for openssl/ssl.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 801 "configure"
+#include "confdefs.h"
+
+                   #include <openssl/ssl.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 798 "configure"
+#line 828 "configure"
 #include "confdefs.h"
 
                  #include <openssl/ssl.h>
@@ -802,7 +832,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -812,9 +842,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -842,19 +873,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 850 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 880 "configure"
 #include "confdefs.h"
 
-                      #include <openssl/ssl.h>
+                   #include <openssl/ssl.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -864,21 +894,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_header_openssl_ssl_h" != "xyes"; then
@@ -891,22 +920,49 @@ fi
 sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6
-echo "configure:895: checking for DH_new in -lcrypto" >&5
+echo "configure:924: checking for DH_new in -lcrypto" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lcrypto"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 934 "configure"
+#include "confdefs.h"
+extern char DH_new();
+int main() {
+ DH_new()
+; return 0; }
+EOF
+if { (eval echo configure:941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lcrypto"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lcrypto $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 903 "configure"
+#line 959 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lcrypto"
 else
@@ -914,9 +970,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -943,7 +1001,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -971,18 +1029,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lcrypto"
-
-      cat > conftest.$ac_ext <<EOF
-#line 979 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1036 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lcrypto"
 else
@@ -990,20 +1047,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test "x$ac_cv_lib_crypto_DH_new" != "xyes"; then
@@ -1015,22 +1072,49 @@ fi
 sm_lib_safe=`echo "ssl" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "SSL_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:1019: checking for SSL_new in -lssl" >&5
+echo "configure:1076: checking for SSL_new in -lssl" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lssl"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lssl $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1086 "configure"
+#include "confdefs.h"
+extern char SSL_new();
+int main() {
+ SSL_new()
+; return 0; }
+EOF
+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lssl"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lssl $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1027 "configure"
+#line 1111 "configure"
 #include "confdefs.h"
 extern char SSL_new();
 int main() {
  SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lssl"
 else
@@ -1038,9 +1122,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1067,7 +1153,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1095,18 +1181,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lssl"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1103 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lssl $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1188 "configure"
 #include "confdefs.h"
 extern char SSL_new();
 int main() {
  SSL_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lssl"
 else
@@ -1114,20 +1199,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
     if test "x$ac_cv_lib_ssl_SSL_new" != "xyes"; then
@@ -1135,7 +1220,7 @@ fi
     fi
 
        echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1139: checking how to run the C preprocessor" >&5
+echo "configure:1224: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1150,13 +1235,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1154 "configure"
+#line 1239 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1167,13 +1252,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1171 "configure"
+#line 1256 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1184,13 +1269,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1188 "configure"
+#line 1273 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1221,17 +1306,17 @@ for ac_hdr in \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1225: checking for $ac_hdr" >&5
+echo "configure:1310: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1230 "configure"
+#line 1315 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
index e8b19e0..83bf2df 100755 (executable)
@@ -835,12 +835,42 @@ ac_safe=`echo "gdbm.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6
 echo "configure:837: checking for gdbm.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 847 "configure"
+#include "confdefs.h"
+
+                   #include <gdbm.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 844 "configure"
+#line 874 "configure"
 #include "confdefs.h"
 
                  #include <gdbm.h>
@@ -848,7 +878,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -858,9 +888,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -888,19 +919,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 896 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 926 "configure"
 #include "confdefs.h"
 
-                      #include <gdbm.h>
+                   #include <gdbm.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -910,21 +940,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        
@@ -932,22 +961,49 @@ fi
 sm_lib_safe=`echo "gdbm" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "gdbm_open" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:936: checking for gdbm_open in -lgdbm" >&5
+echo "configure:965: checking for gdbm_open in -lgdbm" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lgdbm"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lgdbm $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 975 "configure"
+#include "confdefs.h"
+extern char gdbm_open();
+int main() {
+ gdbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lgdbm"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lgdbm $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 944 "configure"
+#line 1000 "configure"
 #include "confdefs.h"
 extern char gdbm_open();
 int main() {
  gdbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lgdbm"
 else
@@ -955,9 +1011,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -984,7 +1042,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1012,18 +1070,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lgdbm"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1020 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lgdbm $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1077 "configure"
 #include "confdefs.h"
 extern char gdbm_open();
 int main() {
  gdbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:1027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lgdbm"
 else
@@ -1031,20 +1088,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_lib_gdbm_gdbm_open" != "xyes"; then
@@ -1053,9 +1110,9 @@ fi
 
        if test "x$fail" = "x"; then
                echo $ac_n "checking to see GDBM_SYNC status""... $ac_c" 1>&6
-echo "configure:1057: checking to see GDBM_SYNC status" >&5
+echo "configure:1114: checking to see GDBM_SYNC status" >&5
                cat > conftest.$ac_ext <<EOF
-#line 1059 "configure"
+#line 1116 "configure"
 #include "confdefs.h"
 
 #include <gdbm.h>
@@ -1090,12 +1147,12 @@ rm -f conftest*
        old_LIBS=$LIBS
        LIBS="$LIBS $SMART_LIBS"
        echo $ac_n "checking for gdbm_fdesc""... $ac_c" 1>&6
-echo "configure:1094: checking for gdbm_fdesc" >&5
+echo "configure:1151: checking for gdbm_fdesc" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gdbm_fdesc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1099 "configure"
+#line 1156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gdbm_fdesc(); below.  */
@@ -1118,7 +1175,7 @@ gdbm_fdesc();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gdbm_fdesc=yes"
 else
index 95f7b07..246fcde 100755 (executable)
@@ -890,12 +890,42 @@ ac_safe=`echo "krb5.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for krb5.h""... $ac_c" 1>&6
 echo "configure:892: checking for krb5.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 902 "configure"
+#include "confdefs.h"
+
+                   #include <krb5.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 899 "configure"
+#line 929 "configure"
 #include "confdefs.h"
 
                  #include <krb5.h>
@@ -903,7 +933,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -913,9 +943,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -943,19 +974,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 951 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 981 "configure"
 #include "confdefs.h"
 
-                      #include <krb5.h>
+                   #include <krb5.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -965,21 +995,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
 
@@ -990,22 +1019,49 @@ fi
 sm_lib_safe=`echo "k5crypto" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "krb5_encrypt_data" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for krb5_encrypt_data in -lk5crypto""... $ac_c" 1>&6
-echo "configure:994: checking for krb5_encrypt_data in -lk5crypto" >&5
+echo "configure:1023: checking for krb5_encrypt_data in -lk5crypto" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lk5crypto"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lk5crypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1033 "configure"
+#include "confdefs.h"
+extern char krb5_encrypt_data();
+int main() {
+ krb5_encrypt_data()
+; return 0; }
+EOF
+if { (eval echo configure:1040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lk5crypto"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lk5crypto $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1002 "configure"
+#line 1058 "configure"
 #include "confdefs.h"
 extern char krb5_encrypt_data();
 int main() {
  krb5_encrypt_data()
 ; return 0; }
 EOF
-if { (eval echo configure:1009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lk5crypto"
 else
@@ -1013,9 +1069,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1042,7 +1100,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1070,18 +1128,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lk5crypto"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1078 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lk5crypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1135 "configure"
 #include "confdefs.h"
 extern char krb5_encrypt_data();
 int main() {
  krb5_encrypt_data()
 ; return 0; }
 EOF
-if { (eval echo configure:1085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lk5crypto"
 else
@@ -1089,20 +1146,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_lib_k5crypto_krb5_encrypt_data" = "xyes"; then
@@ -1114,22 +1171,49 @@ fi
 sm_lib_safe=`echo "crypto" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "DH_new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for DH_new in -lcrypto""... $ac_c" 1>&6
-echo "configure:1118: checking for DH_new in -lcrypto" >&5
+echo "configure:1175: checking for DH_new in -lcrypto" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lcrypto"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1185 "configure"
+#include "confdefs.h"
+extern char DH_new();
+int main() {
+ DH_new()
+; return 0; }
+EOF
+if { (eval echo configure:1192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lcrypto"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lcrypto $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1126 "configure"
+#line 1210 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lcrypto"
 else
@@ -1137,9 +1221,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1166,7 +1252,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1194,18 +1280,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lcrypto"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1202 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lcrypto $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1287 "configure"
 #include "confdefs.h"
 extern char DH_new();
 int main() {
  DH_new()
 ; return 0; }
 EOF
-if { (eval echo configure:1209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lcrypto"
 else
@@ -1213,20 +1298,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_lib_crypto_DH_new" = "xyes"; then
@@ -1242,22 +1327,49 @@ fi
 sm_lib_safe=`echo "com_err" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "set_com_err_hook" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for set_com_err_hook in -lcom_err""... $ac_c" 1>&6
-echo "configure:1246: checking for set_com_err_hook in -lcom_err" >&5
+echo "configure:1331: checking for set_com_err_hook in -lcom_err" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lcom_err"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lcom_err $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1341 "configure"
+#include "confdefs.h"
+extern char set_com_err_hook();
+int main() {
+ set_com_err_hook()
+; return 0; }
+EOF
+if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lcom_err"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lcom_err $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1254 "configure"
+#line 1366 "configure"
 #include "confdefs.h"
 extern char set_com_err_hook();
 int main() {
  set_com_err_hook()
 ; return 0; }
 EOF
-if { (eval echo configure:1261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lcom_err"
 else
@@ -1265,9 +1377,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1294,7 +1408,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1322,18 +1436,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lcom_err"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1330 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lcom_err $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1443 "configure"
 #include "confdefs.h"
 extern char set_com_err_hook();
 int main() {
  set_com_err_hook()
 ; return 0; }
 EOF
-if { (eval echo configure:1337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lcom_err"
 else
@@ -1341,20 +1454,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_lib_com_err_set_com_err_hook" != "xyes"; then
@@ -1366,22 +1479,49 @@ fi
 sm_lib_safe=`echo "krb5" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "krb5_init_context" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for krb5_init_context in -lkrb5""... $ac_c" 1>&6
-echo "configure:1370: checking for krb5_init_context in -lkrb5" >&5
+echo "configure:1483: checking for krb5_init_context in -lkrb5" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lkrb5"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lkrb5 $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1493 "configure"
+#include "confdefs.h"
+extern char krb5_init_context();
+int main() {
+ krb5_init_context()
+; return 0; }
+EOF
+if { (eval echo configure:1500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lkrb5"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lkrb5 $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1378 "configure"
+#line 1518 "configure"
 #include "confdefs.h"
 extern char krb5_init_context();
 int main() {
  krb5_init_context()
 ; return 0; }
 EOF
-if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lkrb5"
 else
@@ -1389,9 +1529,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1418,7 +1560,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1446,18 +1588,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lkrb5"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1454 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lkrb5 $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1595 "configure"
 #include "confdefs.h"
 extern char krb5_init_context();
 int main() {
  krb5_init_context()
 ; return 0; }
 EOF
-if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lkrb5"
 else
@@ -1465,20 +1606,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_lib_krb5_krb5_init_context" != "xyes"; then
index 1158228..c6f59f4 100755 (executable)
@@ -873,12 +873,42 @@ ac_safe=`echo "EXTERN.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for EXTERN.h""... $ac_c" 1>&6
 echo "configure:875: checking for EXTERN.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 885 "configure"
+#include "confdefs.h"
+
+                   #include <EXTERN.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 882 "configure"
+#line 912 "configure"
 #include "confdefs.h"
 
                  #include <EXTERN.h>
@@ -886,7 +916,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -896,9 +926,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -926,19 +957,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 934 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 964 "configure"
 #include "confdefs.h"
 
-                      #include <EXTERN.h>
+                   #include <EXTERN.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -948,21 +978,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
          if test "x$ac_cv_header_EXTERN_h" = "xyes"; then
@@ -976,14 +1005,44 @@ fi
 
 ac_safe=`echo "perl.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for perl.h""... $ac_c" 1>&6
-echo "configure:980: checking for perl.h" >&5
+echo "configure:1009: checking for perl.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 1019 "configure"
+#include "confdefs.h"
+#include <EXTERN.h>
+                   #include <perl.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:1027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 987 "configure"
+#line 1046 "configure"
 #include "confdefs.h"
 #include <EXTERN.h>
                  #include <perl.h>
@@ -991,7 +1050,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -1001,9 +1060,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1031,19 +1091,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1039 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 1098 "configure"
 #include "confdefs.h"
 #include <EXTERN.h>
-                      #include <perl.h>
+                   #include <perl.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -1053,21 +1112,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
          if test "x$ac_cv_header_perl_h" = "xyes"; then
index e7b0a67..19f57b4 100755 (executable)
@@ -936,12 +936,42 @@ ac_safe=`echo "Python.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for Python.h""... $ac_c" 1>&6
 echo "configure:938: checking for Python.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 948 "configure"
+#include "confdefs.h"
+
+                   #include <Python.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 945 "configure"
+#line 975 "configure"
 #include "confdefs.h"
 
                  #include <Python.h>
@@ -949,7 +979,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -959,9 +989,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -989,19 +1020,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 997 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 1027 "configure"
 #include "confdefs.h"
 
-                      #include <Python.h>
+                   #include <Python.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -1011,21 +1041,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
                CFLAGS=$old_CFLAGS
@@ -1045,22 +1074,49 @@ fi
 sm_lib_safe=`echo "python${PY_VERSION}" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "Py_Initialize" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Py_Initialize in -lpython${PY_VERSION}""... $ac_c" 1>&6
-echo "configure:1049: checking for Py_Initialize in -lpython${PY_VERSION}" >&5
+echo "configure:1078: checking for Py_Initialize in -lpython${PY_VERSION}" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lpython${PY_VERSION}"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lpython${PY_VERSION} $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1088 "configure"
+#include "confdefs.h"
+extern char Py_Initialize();
+int main() {
+ Py_Initialize()
+; return 0; }
+EOF
+if { (eval echo configure:1095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lpython${PY_VERSION}"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lpython${PY_VERSION} $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 1057 "configure"
+#line 1113 "configure"
 #include "confdefs.h"
 extern char Py_Initialize();
 int main() {
  Py_Initialize()
 ; return 0; }
 EOF
-if { (eval echo configure:1064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lpython${PY_VERSION}"
 else
@@ -1068,9 +1124,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1097,7 +1155,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -1125,18 +1183,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lpython${PY_VERSION}"
-
-      cat > conftest.$ac_ext <<EOF
-#line 1133 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lpython${PY_VERSION} $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1190 "configure"
 #include "confdefs.h"
 extern char Py_Initialize();
 int main() {
  Py_Initialize()
 ; return 0; }
 EOF
-if { (eval echo configure:1140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lpython${PY_VERSION}"
 else
@@ -1144,20 +1201,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
                LIBS=$old_LIBS
index f060eda..f192a12 100755 (executable)
@@ -799,12 +799,42 @@ ac_safe=`echo "libpq-fe.h" | sed 'y%./+-%__pm%'`
 echo $ac_n "checking for libpq-fe.h""... $ac_c" 1>&6
 echo "configure:801: checking for libpq-fe.h" >&5
 
+old_CFLAGS="$CFLAGS"
 smart_include=
 smart_include_dir=
 
-  old_CFLAGS="$CFLAGS"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 811 "configure"
+#include "confdefs.h"
+
+                   #include <libpq-fe.h>
+int main() {
+ int a = 1;
+; return 0; }
+EOF
+if { (eval echo configure:819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  smart_include="-I$try"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  smart_include=
+fi
+rm -f conftest*
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
+    CFLAGS="$old_CFLAGS"
+  done
+fi
+
+if test "x$smart_include" = "x"; then
   cat > conftest.$ac_ext <<EOF
-#line 808 "configure"
+#line 838 "configure"
 #include "confdefs.h"
 
                  #include <libpq-fe.h>
@@ -812,7 +842,7 @@ int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include=" "
 else
@@ -822,9 +852,10 @@ else
   smart_include=
 fi
 rm -f conftest*
+fi
 
-  if test "x$smart_include" = "x"; then
-    
+if test "x$smart_include" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -852,19 +883,18 @@ fi
 eval "smart_include_dir=\"\$smart_include_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_include_dir /usr/local/include/ /opt/include; do
-      CFLAGS="$old_CFLAGS -I$try"
-
-      cat > conftest.$ac_ext <<EOF
-#line 860 "configure"
+  for try in $smart_include_dir /usr/local/include /opt/include; do
+    CFLAGS="$old_CFLAGS -I$try"
+    cat > conftest.$ac_ext <<EOF
+#line 890 "configure"
 #include "confdefs.h"
 
-                      #include <libpq-fe.h>
+                   #include <libpq-fe.h>
 int main() {
  int a = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   smart_include="-I$try"
 else
@@ -874,21 +904,20 @@ else
   smart_include=
 fi
 rm -f conftest*
-
-      if test "x$smart_include" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_include" != "x"; then
+      break;
+    fi
     CFLAGS="$old_CFLAGS"
-  fi
+  done
+fi
 
-        if test "x$smart_include" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_header_$ac_safe=yes"
-    CFLAGS="$old_CFLAGS $smart_include"
-    SMART_CFLAGS="$SMART_CFLAGS $smart_include"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_include" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_header_$ac_safe=yes"
+  CFLAGS="$old_CFLAGS $smart_include"
+  SMART_CFLAGS="$SMART_CFLAGS $smart_include"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
        if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then
@@ -901,22 +930,49 @@ fi
 sm_lib_safe=`echo "pq" | sed 'y%./+-%__p_%'`
 sm_func_safe=`echo "PQconnectdb" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:905: checking for PQconnectdb in -lpq" >&5
+echo "configure:934: checking for PQconnectdb in -lpq" >&5
 
+old_LIBS="$LIBS"
 smart_lib=
 smart_lib_dir=
 
-  old_LIBS="$LIBS"
-  LIBS="$LIBS -lpq"
+if test "x$smart_try_dir" != "x"; then
+  for try in $smart_try_dir; do
+    LIBS="-L$try -lpq $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 944 "configure"
+#include "confdefs.h"
+extern char PQconnectdb();
+int main() {
+ PQconnectdb()
+; return 0; }
+EOF
+if { (eval echo configure:951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  smart_lib="-L$try -lpq"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
+    LIBS="$old_LIBS"
+  done
+fi
+
+if test "x$smart_lib" = "x"; then
+  LIBS="-lpq $old_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 913 "configure"
+#line 969 "configure"
 #include "confdefs.h"
 extern char PQconnectdb();
 int main() {
  PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-lpq"
 else
@@ -924,9 +980,11 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+  LIBS="$old_LIBS"
+fi
 
-  if test "x$smart_lib" = "x"; then
-    
+if test "x$smart_lib" = "x"; then
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -953,7 +1011,7 @@ fi
 
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
-    
+  
 
 if test "x$LOCATE" != "x"; then
         DIRS=
@@ -981,18 +1039,17 @@ fi
 eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
-    for try in $smart_try_dir $smart_lib_dir /usr/local/lib/ /opt/lib; do
-      LIBS="$old_LIBS -L$try -lpq"
-
-      cat > conftest.$ac_ext <<EOF
-#line 989 "configure"
+  for try in $smart_lib_dir /usr/local/lib /opt/lib; do
+    LIBS="-L$try -lpq $old_LIBS"
+    cat > conftest.$ac_ext <<EOF
+#line 1046 "configure"
 #include "confdefs.h"
 extern char PQconnectdb();
 int main() {
  PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   smart_lib="-L$try -lpq"
 else
@@ -1000,20 +1057,20 @@ else
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-      if test "x$smart_lib" != "x"; then
-        break;
-      fi
-    done
+    if test "x$smart_lib" != "x"; then
+      break;
+    fi
     LIBS="$old_LIBS"
-  fi
+  done
+fi
 
-        if test "x$smart_lib" != "x"; then
-    echo "$ac_t""yes" 1>&6
-    eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
-    LIBS="$old_LIBS $smart_lib"
-    SMART_LIBS="$SMART_LIBS $smart_lib"
-  else
-    echo "$ac_t""no" 1>&6 
+if test "x$smart_lib" != "x"; then
+  echo "$ac_t""yes" 1>&6
+  eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes"
+  LIBS="$smart_lib $old_LIBS"
+  SMART_LIBS="$smart_lib $SMART_LIBS"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
         if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then