--- ./build/fastgen.sh	Thu Feb 28 00:25:33 2002
+++ ../php-4.2.3/./build/fastgen.sh	Tue Dec 31 12:30:39 2002
@@ -47,7 +47,7 @@
   for makefile in $@; do
     echo "fastgen.sh: creating $makefile"
     dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
-    $mkdir_p "$dir/"
+    test "$dir" && $mkdir_p "$dir/"
 
     cat - $top_srcdir/$makefile.in <<EOF |sed 's/^include \(.*\)/.include "\1"/' >$makefile 
 top_srcdir   = $top_srcdir
@@ -64,7 +64,7 @@
   for makefile in $@; do
     echo "fastgen.sh: creating $makefile"
     dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
-    $mkdir_p "$dir/"
+    test "$dir" && $mkdir_p "$dir/"
 
     cat - $top_srcdir/$makefile.in <<EOF >$makefile
 top_srcdir   = $top_srcdir
--- ./configure	Thu Sep  5 16:40:53 2002
+++ ../php-4.2.3/./configure	Tue Dec 31 12:30:47 2002
@@ -1065,7 +1065,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
+libdir='${exec_prefix}/${ABILIB}'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 infodir='${prefix}/info'
@@ -1182,7 +1182,7 @@
   --sharedstatedir=DIR    modifiable architecture-independent data in DIR
                           [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/${ABILIB}]
   --includedir=DIR        C header files in DIR [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
   --infodir=DIR           info documentation in DIR [PREFIX/info]
@@ -1696,6 +1696,10 @@
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -2463,7 +2467,7 @@
 else
   
 	SAVE_LIBS=$LIBS
-	LIBS="-R /usr/lib $LIBS"
+	LIBS="-R /usr/${ABILIB} $LIBS"
 	cat > conftest.$ac_ext <<EOF
 #line 2469 "configure"
 #include "confdefs.h"
@@ -2496,7 +2500,7 @@
 else
   
 		SAVE_LIBS=$LIBS
-		LIBS="-Wl,-rpath,/usr/lib $LIBS"
+		LIBS="-Wl,-rpath,/usr/${ABILIB} $LIBS"
 		cat > conftest.$ac_ext <<EOF
 #line 2502 "configure"
 #include "confdefs.h"
@@ -3946,7 +3950,7 @@
 	
   php_build_target=shared
 
-	INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib/$PIKE_VERSION/PHP4.so"
+	INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/${ABILIB}/$PIKE_VERSION/PHP4.so"
 	RESULT="	*** Pike binary used:         $PIKE
 	*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
 	*** Pike version:             $PIKE_VERSION"
@@ -4236,10 +4240,10 @@
   else
         FASTCGIPATH=$withval
   fi
-  test -f "$FASTCGIPATH/lib/libfcgi.a" || { echo "configure: error: Unable to find libfcgi.a in $FASTCGIPATH/lib" 1>&2; exit 1; }
+  test -f "$FASTCGIPATH/${ABILIB}/libfcgi.a" || { echo "configure: error: Unable to find libfcgi.a in $FASTCGIPATH/${ABILIB}" 1>&2; exit 1; }
   test -f "$FASTCGIPATH/include/fastcgi.h" || { echo "configure: error: Unable to find fastcgi.h in $FASTCGIPATH/include" 1>&2; exit 1; }
   PHP_SAPI=fastcgi
-  PHP_LIBS=$FASTCGIPATH/lib/libfcgi.a
+  PHP_LIBS=$FASTCGIPATH/${ABILIB}/libfcgi.a
   
   if test "$FASTCGIPATH/include" != "/usr/include"; then
     
@@ -4271,7 +4275,7 @@
 
   fi
 
-  EXT_PROGRAM_LDADD="$EXT_PROGRAM_LDADD $FASTCGIPATH/lib/libfcgi.a"
+  EXT_PROGRAM_LDADD="$EXT_PROGRAM_LDADD $FASTCGIPATH/${ABILIB}/libfcgi.a"
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_FASTCGI"
   RESULT=yes
   
@@ -4824,12 +4828,12 @@
     if test "$withval" = "yes"; then
       SERVLET_CLASSPATH=.
     else
-      if test -f $withval/lib/servlet.jar; then
-        SERVLET_CLASSPATH=$withval/lib/servlet.jar
+      if test -f $withval/${ABILIB}/servlet.jar; then
+        SERVLET_CLASSPATH=$withval/${ABILIB}/servlet.jar
       fi
 
-      if test -f $withval/lib/jsdk.jar; then
-        SERVLET_CLASSPATH=$withval/lib/jsdk.jar
+      if test -f $withval/${ABILIB}/jsdk.jar; then
+        SERVLET_CLASSPATH=$withval/${ABILIB}/jsdk.jar
       fi
 
       if test -d $withval/javax; then
@@ -5323,7 +5327,7 @@
   ;;
   *)
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib"
+  ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/${ABILIB}"
   for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -5396,13 +5400,13 @@
 
   fi
 
-if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+if test -d /usr/pkg/include -a -d /usr/pkg/${ABILIB} ; then
        CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
-       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+       LDFLAGS="$LDFLAGS -L/usr/pkg/${ABILIB}"
 fi
 INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
 test -d /usr/ucblib && 
-  if test "/usr/ucblib" != "/usr/lib"; then
+  if test "/usr/ucblib" != "/usr/${ABILIB}"; then
     
   if test -z "/usr/ucblib" || echo "/usr/ucblib" | grep '^/' >/dev/null ; then
     ai_p=/usr/ucblib
@@ -8565,6 +8569,9 @@
   test "$PHP_OPENSSL" = "no" && PHP_OPENSSL=yes
 fi
 
+openssl_ext_shared=$ext_shared
+  PHP_VAR_SUBST="$PHP_VAR_SUBST OPENSSL_SHARED_LIBADD"
+
 if test -n "for OpenSSL support"; then
   echo "$ac_t""$ext_output" 1>&6
 fi
@@ -8623,20 +8630,20 @@
   CPPFLAGS=$old_CPPFLAGS
 
   
-  if test "$OPENSSL_DIR/lib" != "/usr/lib"; then
+  if test "$OPENSSL_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$OPENSSL_DIR/lib" || echo "$OPENSSL_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$OPENSSL_DIR/lib
+  if test -z "$OPENSSL_DIR/${ABILIB}" || echo "$OPENSSL_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$OPENSSL_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $OPENSSL_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $OPENSSL_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OPENSSL_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$OPENSSL_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$OPENSSL_DIR/lib -L$OPENSSL_DIR/lib $"
+      OPENSSL_SHARED_LIBADD="-L$OPENSSL_DIR/${ABILIB} $OPENSSL_SHARED_LIBADD"
     else
       
   
@@ -9033,7 +9040,7 @@
     { echo "configure: error: Cannot locate libgcc. Make sure that gcc is in your path" 1>&2; exit 1; }
   fi
   
-  if test "$libgcc_libpath" != "/usr/lib"; then
+  if test "$libgcc_libpath" != "/usr/${ABILIB}"; then
     
   if test -z "$libgcc_libpath" || echo "$libgcc_libpath" | grep '^/' >/dev/null ; then
     ai_p=$libgcc_libpath
@@ -9046,7 +9053,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$libgcc_libpath -L$libgcc_libpath $"
+      ="-L$libgcc_libpath $"
     else
       
   
@@ -9682,20 +9689,20 @@
   fi
 
   
-  if test "$ZLIB_DIR/lib" != "/usr/lib"; then
+  if test "$ZLIB_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ZLIB_DIR/lib" || echo "$ZLIB_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ZLIB_DIR/lib
+  if test -z "$ZLIB_DIR/${ABILIB}" || echo "$ZLIB_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ZLIB_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ZLIB_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ZLIB_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ZLIB_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ZLIB_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ZLIB_SHARED_LIBADD"; then
-      ZLIB_SHARED_LIBADD="-R$ZLIB_DIR/lib -L$ZLIB_DIR/lib $ZLIB_SHARED_LIBADD"
+      ZLIB_SHARED_LIBADD="-L$ZLIB_DIR/${ABILIB} $ZLIB_SHARED_LIBADD"
     else
       
   
@@ -9988,22 +9995,22 @@
 
     
 
-  if test -n "$ASPELL_DIR/lib"; then
+  if test -n "$ASPELL_DIR/${ABILIB}"; then
     
-  if test "$ASPELL_DIR/lib" != "/usr/lib"; then
+  if test "$ASPELL_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ASPELL_DIR/lib" || echo "$ASPELL_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ASPELL_DIR/lib
+  if test -z "$ASPELL_DIR/${ABILIB}" || echo "$ASPELL_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ASPELL_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ASPELL_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ASPELL_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ASPELL_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ASPELL_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ASPELL_DIR/lib -L$ASPELL_DIR/lib $"
+      ="-L$ASPELL_DIR/${ABILIB} $"
     else
       
   
@@ -10745,22 +10752,22 @@
 
   if test "$ext_shared" = "yes"; then
     BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD"
-    if test -n "$BZIP_DIR/lib"; then
+    if test -n "$BZIP_DIR/${ABILIB}"; then
       
-  if test "$BZIP_DIR/lib" != "/usr/lib"; then
+  if test "$BZIP_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$BZIP_DIR/lib" || echo "$BZIP_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$BZIP_DIR/lib
+  if test -z "$BZIP_DIR/${ABILIB}" || echo "$BZIP_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$BZIP_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $BZIP_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $BZIP_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$BZIP_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$BZIP_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "BZ2_SHARED_LIBADD"; then
-      BZ2_SHARED_LIBADD="-R$BZIP_DIR/lib -L$BZIP_DIR/lib $BZ2_SHARED_LIBADD"
+      BZ2_SHARED_LIBADD="-L$BZIP_DIR/${ABILIB} $BZ2_SHARED_LIBADD"
     else
       
   
@@ -10783,22 +10790,22 @@
   else
     
 
-  if test -n "$BZIP_DIR/lib"; then
+  if test -n "$BZIP_DIR/${ABILIB}"; then
     
-  if test "$BZIP_DIR/lib" != "/usr/lib"; then
+  if test "$BZIP_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$BZIP_DIR/lib" || echo "$BZIP_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$BZIP_DIR/lib
+  if test -z "$BZIP_DIR/${ABILIB}" || echo "$BZIP_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$BZIP_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $BZIP_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $BZIP_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$BZIP_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$BZIP_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$BZIP_DIR/lib -L$BZIP_DIR/lib $"
+      ="-L$BZIP_DIR/${ABILIB} $"
     else
       
   
@@ -11449,22 +11456,22 @@
 
   if test "$ext_shared" = "yes"; then
     CCVS_SHARED_LIBADD="-lccvs $CCVS_SHARED_LIBADD"
-    if test -n "$CCVS_DIR/lib"; then
+    if test -n "$CCVS_DIR/${ABILIB}"; then
       
-  if test "$CCVS_DIR/lib" != "/usr/lib"; then
+  if test "$CCVS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$CCVS_DIR/lib" || echo "$CCVS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$CCVS_DIR/lib
+  if test -z "$CCVS_DIR/${ABILIB}" || echo "$CCVS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$CCVS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $CCVS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $CCVS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$CCVS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$CCVS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "CCVS_SHARED_LIBADD"; then
-      CCVS_SHARED_LIBADD="-R$CCVS_DIR/lib -L$CCVS_DIR/lib $CCVS_SHARED_LIBADD"
+      CCVS_SHARED_LIBADD="-L$CCVS_DIR/${ABILIB} $CCVS_SHARED_LIBADD"
     else
       
   
@@ -11487,22 +11494,22 @@
   else
     
 
-  if test -n "$CCVS_DIR/lib"; then
+  if test -n "$CCVS_DIR/${ABILIB}"; then
     
-  if test "$CCVS_DIR/lib" != "/usr/lib"; then
+  if test "$CCVS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$CCVS_DIR/lib" || echo "$CCVS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$CCVS_DIR/lib
+  if test -z "$CCVS_DIR/${ABILIB}" || echo "$CCVS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$CCVS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $CCVS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $CCVS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$CCVS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$CCVS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$CCVS_DIR/lib -L$CCVS_DIR/lib $"
+      ="-L$CCVS_DIR/${ABILIB} $"
     else
       
   
@@ -12269,7 +12276,7 @@
           if test -z $withval; then
             withval=/usr/local
           fi
-          LIBS="$LIBS -L$withval/lib"
+          LIBS="$LIBS -L$withval/${ABILIB}"
           echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
 echo "configure:12275: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
@@ -12320,22 +12327,22 @@
 
           
 
-  if test -n "$withval/lib"; then
+  if test -n "$withval/${ABILIB}"; then
     
-  if test "$withval/lib" != "/usr/lib"; then
+  if test "$withval/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$withval/lib" || echo "$withval/lib" | grep '^/' >/dev/null ; then
-    ai_p=$withval/lib
+  if test -z "$withval/${ABILIB}" || echo "$withval/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$withval/${ABILIB}
   else
     
-    ep_dir="`echo $withval/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $withval/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$withval/lib\"`"
+    ai_p="$ep_realdir/`basename \"$withval/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$withval/lib -L$withval/lib $"
+      ="-L$withval/${ABILIB} $"
     else
       
   
@@ -12388,7 +12395,7 @@
           if test -z $withval; then
             withval=/usr/local
           fi
-          LIBS="$LIBS -L$withval/lib"
+          LIBS="$LIBS -L$withval/${ABILIB}"
           echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
 echo "configure:12394: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
@@ -12439,22 +12446,22 @@
 
           
 
-  if test -n "$withval/lib"; then
+  if test -n "$withval/${ABILIB}"; then
     
-  if test "$withval/lib" != "/usr/lib"; then
+  if test "$withval/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$withval/lib" || echo "$withval/lib" | grep '^/' >/dev/null ; then
-    ai_p=$withval/lib
+  if test -z "$withval/${ABILIB}" || echo "$withval/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$withval/${ABILIB}
   else
     
-    ep_dir="`echo $withval/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $withval/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$withval/lib\"`"
+    ai_p="$ep_realdir/`basename \"$withval/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$withval/lib -L$withval/lib $"
+      ="-L$withval/${ABILIB} $"
     else
       
   
@@ -12498,7 +12505,7 @@
  
         withval=$old_withval
 
-          LIBS="$LIBS -L$withval/lib"
+          LIBS="$LIBS -L$withval/${ABILIB}"
         echo $ac_n "checking for cpdf_open in -lcpdf""... $ac_c" 1>&6
 echo "configure:12504: checking for cpdf_open in -lcpdf" >&5
 ac_lib_var=`echo cpdf'_'cpdf_open | sed 'y%./+-%__p_%'`
@@ -12546,22 +12553,22 @@
         LIBS=$old_LIBS
         
 
-  if test -n "$withval/lib"; then
+  if test -n "$withval/${ABILIB}"; then
     
-  if test "$withval/lib" != "/usr/lib"; then
+  if test "$withval/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$withval/lib" || echo "$withval/lib" | grep '^/' >/dev/null ; then
-    ai_p=$withval/lib
+  if test -z "$withval/${ABILIB}" || echo "$withval/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$withval/${ABILIB}
   else
     
-    ep_dir="`echo $withval/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $withval/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$withval/lib\"`"
+    ai_p="$ep_realdir/`basename \"$withval/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$withval/lib -L$withval/lib $"
+      ="-L$withval/${ABILIB} $"
     else
       
   
@@ -12690,7 +12697,7 @@
 
 if test "$PHP_CRACK" != "no"; then
 
-	for i in /usr/local/lib /usr/lib $PHP_CRACK/lib $PHP_CRACK/cracklib; do
+	for i in /usr/local/${ABILIB} /usr/${ABILIB} $PHP_CRACK/${ABILIB} $PHP_CRACK/cracklib; do
 		test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i
 	done
 
@@ -12743,7 +12750,7 @@
     CRACK_SHARED_LIBADD="-lcrack $CRACK_SHARED_LIBADD"
     if test -n "$CRACK_LIBDIR"; then
       
-  if test "$CRACK_LIBDIR" != "/usr/lib"; then
+  if test "$CRACK_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$CRACK_LIBDIR" || echo "$CRACK_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$CRACK_LIBDIR
@@ -12756,7 +12763,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "CRACK_SHARED_LIBADD"; then
-      CRACK_SHARED_LIBADD="-R$CRACK_LIBDIR -L$CRACK_LIBDIR $CRACK_SHARED_LIBADD"
+      CRACK_SHARED_LIBADD="-L$CRACK_LIBDIR $CRACK_SHARED_LIBADD"
     else
       
   
@@ -12781,7 +12788,7 @@
 
   if test -n "$CRACK_LIBDIR"; then
     
-  if test "$CRACK_LIBDIR" != "/usr/lib"; then
+  if test "$CRACK_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$CRACK_LIBDIR" || echo "$CRACK_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$CRACK_LIBDIR
@@ -12794,7 +12801,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$CRACK_LIBDIR -L$CRACK_LIBDIR $"
+      ="-L$CRACK_LIBDIR $"
     else
       
   
@@ -13467,7 +13474,7 @@
     -L*)
       ac_ii=`echo $ac_i|cut -c 3-`
       
-  if test "$ac_ii" != "/usr/lib"; then
+  if test "$ac_ii" != "/usr/${ABILIB}"; then
     
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
@@ -13480,7 +13487,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "CURL_SHARED_LIBADD"; then
-      CURL_SHARED_LIBADD="-R$ac_ii -L$ac_ii $CURL_SHARED_LIBADD"
+      CURL_SHARED_LIBADD="-L$ac_ii $CURL_SHARED_LIBADD"
     else
       
   
@@ -13507,22 +13514,22 @@
 
   if test "$ext_shared" = "yes"; then
     CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD"
-    if test -n "$CURL_DIR/lib"; then
+    if test -n "$CURL_DIR/${ABILIB}"; then
       
-  if test "$CURL_DIR/lib" != "/usr/lib"; then
+  if test "$CURL_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$CURL_DIR/lib" || echo "$CURL_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$CURL_DIR/lib
+  if test -z "$CURL_DIR/${ABILIB}" || echo "$CURL_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$CURL_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $CURL_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $CURL_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$CURL_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$CURL_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "CURL_SHARED_LIBADD"; then
-      CURL_SHARED_LIBADD="-R$CURL_DIR/lib -L$CURL_DIR/lib $CURL_SHARED_LIBADD"
+      CURL_SHARED_LIBADD="-L$CURL_DIR/${ABILIB} $CURL_SHARED_LIBADD"
     else
       
   
@@ -13545,22 +13552,22 @@
   else
     
 
-  if test -n "$CURL_DIR/lib"; then
+  if test -n "$CURL_DIR/${ABILIB}"; then
     
-  if test "$CURL_DIR/lib" != "/usr/lib"; then
+  if test "$CURL_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$CURL_DIR/lib" || echo "$CURL_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$CURL_DIR/lib
+  if test -z "$CURL_DIR/${ABILIB}" || echo "$CURL_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$CURL_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $CURL_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $CURL_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$CURL_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$CURL_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$CURL_DIR/lib -L$CURL_DIR/lib $"
+      ="-L$CURL_DIR/${ABILIB} $"
     else
       
   
@@ -13601,7 +13608,7 @@
   
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-    $CURL_LIBS -L$CURL_DIR/lib
+    $CURL_LIBS -L$CURL_DIR/${ABILIB}
    $LDFLAGS"
   echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
 echo "configure:13608: checking for curl_easy_perform in -lcurl" >&5
@@ -14086,7 +14093,7 @@
 
 
 	old_LIBS=$LIBS
-	LIBS="$LIBS -L$MCK_DIR/lib"
+	LIBS="$LIBS -L$MCK_DIR/${ABILIB}"
 	echo $ac_n "checking for base64_encode in -lmckcrypto""... $ac_c" 1>&6
 echo "configure:14092: checking for base64_encode in -lmckcrypto" >&5
 ac_lib_var=`echo mckcrypto'_'base64_encode | sed 'y%./+-%__p_%'`
@@ -14134,22 +14141,22 @@
 	LIBS=$old_LIBS
 	
 
-  if test -n "$MCK_DIR/lib"; then
+  if test -n "$MCK_DIR/${ABILIB}"; then
     
-  if test "$MCK_DIR/lib" != "/usr/lib"; then
+  if test "$MCK_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MCK_DIR/lib" || echo "$MCK_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MCK_DIR/lib
+  if test -z "$MCK_DIR/${ABILIB}" || echo "$MCK_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MCK_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MCK_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MCK_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MCK_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MCK_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MCK_DIR/lib -L$MCK_DIR/lib $"
+      ="-L$MCK_DIR/${ABILIB} $"
     else
       
   
@@ -14286,8 +14293,8 @@
  
     if test -r $i/libcm-mac.a; then
       CYBERMUT_LIB_DIR=$i
-    elif test -r $i/lib/libcm-mac.a; then
-      CYBERMUT_LIB_DIR=$i/lib
+    elif test -r $i/${ABILIB}/libcm-mac.a; then
+      CYBERMUT_LIB_DIR=$i/${ABILIB}
     fi
   done
     
@@ -14348,7 +14355,7 @@
     CYBERMUT_SHARED_LIBADD="-lcybermut $CYBERMUT_SHARED_LIBADD"
     if test -n "$CYBERMUT_LIB_DIR"; then
       
-  if test "$CYBERMUT_LIB_DIR" != "/usr/lib"; then
+  if test "$CYBERMUT_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$CYBERMUT_LIB_DIR" || echo "$CYBERMUT_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$CYBERMUT_LIB_DIR
@@ -14361,7 +14368,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "CYBERMUT_SHARED_LIBADD"; then
-      CYBERMUT_SHARED_LIBADD="-R$CYBERMUT_LIB_DIR -L$CYBERMUT_LIB_DIR $CYBERMUT_SHARED_LIBADD"
+      CYBERMUT_SHARED_LIBADD="-L$CYBERMUT_LIB_DIR $CYBERMUT_SHARED_LIBADD"
     else
       
   
@@ -14386,7 +14393,7 @@
 
   if test -n "$CYBERMUT_LIB_DIR"; then
     
-  if test "$CYBERMUT_LIB_DIR" != "/usr/lib"; then
+  if test "$CYBERMUT_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$CYBERMUT_LIB_DIR" || echo "$CYBERMUT_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$CYBERMUT_LIB_DIR
@@ -14399,7 +14406,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$CYBERMUT_LIB_DIR -L$CYBERMUT_LIB_DIR $"
+      ="-L$CYBERMUT_LIB_DIR $"
     else
       
   
@@ -14744,22 +14751,22 @@
 
   if test "$ext_shared" = "yes"; then
     CYRUS_SHARED_LIBADD="-lcyrus $CYRUS_SHARED_LIBADD"
-    if test -n "$i/lib"; then
+    if test -n "$i/${ABILIB}"; then
       
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "CYRUS_SHARED_LIBADD"; then
-      CYRUS_SHARED_LIBADD="-R$i/lib -L$i/lib $CYRUS_SHARED_LIBADD"
+      CYRUS_SHARED_LIBADD="-L$i/${ABILIB} $CYRUS_SHARED_LIBADD"
     else
       
   
@@ -14782,22 +14789,22 @@
   else
     
 
-  if test -n "$i/lib"; then
+  if test -n "$i/${ABILIB}"; then
     
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/lib -L$i/lib $"
+      ="-L$i/${ABILIB} $"
     else
       
   
@@ -14875,22 +14882,22 @@
 
   if test "$ext_shared" = "yes"; then
     SASL_SHARED_LIBADD="-lsasl $SASL_SHARED_LIBADD"
-    if test -n "$i/lib"; then
+    if test -n "$i/${ABILIB}"; then
       
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "SASL_SHARED_LIBADD"; then
-      SASL_SHARED_LIBADD="-R$i/lib -L$i/lib $SASL_SHARED_LIBADD"
+      SASL_SHARED_LIBADD="-L$i/${ABILIB} $SASL_SHARED_LIBADD"
     else
       
   
@@ -14913,22 +14920,22 @@
   else
     
 
-  if test -n "$i/lib"; then
+  if test -n "$i/${ABILIB}"; then
     
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/lib -L$i/lib $"
+      ="-L$i/${ABILIB} $"
     else
       
   
@@ -14978,22 +14985,22 @@
 
   if test "$ext_shared" = "yes"; then
     OPENSSL_SHARED_LIBADD="-lssl $OPENSSL_SHARED_LIBADD"
-    if test -n "$i/lib"; then
+    if test -n "$i/${ABILIB}"; then
       
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "OPENSSL_SHARED_LIBADD"; then
-      OPENSSL_SHARED_LIBADD="-R$i/lib -L$i/lib $OPENSSL_SHARED_LIBADD"
+      OPENSSL_SHARED_LIBADD="-L$i/${ABILIB} $OPENSSL_SHARED_LIBADD"
     else
       
   
@@ -15016,22 +15023,22 @@
   else
     
 
-  if test -n "$i/lib"; then
+  if test -n "$i/${ABILIB}"; then
     
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/lib -L$i/lib $"
+      ="-L$i/${ABILIB} $"
     else
       
   
@@ -15072,22 +15079,22 @@
 
   if test "$ext_shared" = "yes"; then
     CRYPTO_SHARED_LIBADD="-lcrypto $CRYPTO_SHARED_LIBADD"
-    if test -n "$i/lib"; then
+    if test -n "$i/${ABILIB}"; then
       
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "CRYPTO_SHARED_LIBADD"; then
-      CRYPTO_SHARED_LIBADD="-R$i/lib -L$i/lib $CRYPTO_SHARED_LIBADD"
+      CRYPTO_SHARED_LIBADD="-L$i/${ABILIB} $CRYPTO_SHARED_LIBADD"
     else
       
   
@@ -15110,22 +15117,22 @@
   else
     
 
-  if test -n "$i/lib"; then
+  if test -n "$i/${ABILIB}"; then
     
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/lib -L$i/lib $"
+      ="-L$i/${ABILIB} $"
     else
       
   
@@ -16073,7 +16080,7 @@
     unset ac_cv_lib_gdbm_gdbm_open
     
   old_LDFLAGS=$LDFLAGS
-  LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+  LDFLAGS="-L$THIS_PREFIX/${ABILIB} $LDFLAGS"
   
     echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
 echo "configure:16080: checking for gdbm_open in -lgdbm" >&5
@@ -16125,7 +16132,7 @@
     
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_INCLUDE=$THIS_PREFIX/include
-    THIS_LFLAGS=$THIS_PREFIX/lib
+    THIS_LFLAGS=$THIS_PREFIX/${ABILIB}
   fi
 
     
@@ -16175,7 +16182,7 @@
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
       
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -16188,7 +16195,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBA_SHARED_LIBADD"; then
-      DBA_SHARED_LIBADD="-R$THIS_LFLAGS -L$THIS_LFLAGS $DBA_SHARED_LIBADD"
+      DBA_SHARED_LIBADD="-L$THIS_LFLAGS $DBA_SHARED_LIBADD"
     else
       
   
@@ -16213,7 +16220,7 @@
 
   if test -n "$THIS_LFLAGS"; then
     
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -16226,7 +16233,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$THIS_LFLAGS -L$THIS_LFLAGS $"
+      ="-L$THIS_LFLAGS $"
     else
       
   
@@ -16306,7 +16313,7 @@
     for LIB in db1 ndbm c; do
       
   old_LDFLAGS=$LDFLAGS
-  LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+  LDFLAGS="-L$THIS_PREFIX/${ABILIB} $LDFLAGS"
   
       echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
 echo "configure:16313: checking for dbm_open in -l$LIB" >&5
@@ -16359,7 +16366,7 @@
     
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_INCLUDE=$THIS_PREFIX/include
-    THIS_LFLAGS=$THIS_PREFIX/lib
+    THIS_LFLAGS=$THIS_PREFIX/${ABILIB}
   fi
 
     
@@ -16409,7 +16416,7 @@
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
       
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -16422,7 +16429,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBA_SHARED_LIBADD"; then
-      DBA_SHARED_LIBADD="-R$THIS_LFLAGS -L$THIS_LFLAGS $DBA_SHARED_LIBADD"
+      DBA_SHARED_LIBADD="-L$THIS_LFLAGS $DBA_SHARED_LIBADD"
     else
       
   
@@ -16447,7 +16454,7 @@
 
   if test -n "$THIS_LFLAGS"; then
     
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -16460,7 +16467,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$THIS_LFLAGS -L$THIS_LFLAGS $"
+      ="-L$THIS_LFLAGS $"
     else
       
   
@@ -16554,7 +16561,7 @@
     for LIB in db db2 c; do
       
   old_LDFLAGS=$LDFLAGS
-  LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+  LDFLAGS="-L$THIS_PREFIX/${ABILIB} $LDFLAGS"
   
       echo $ac_n "checking for db_appinit in -l$LIB""... $ac_c" 1>&6
 echo "configure:16561: checking for db_appinit in -l$LIB" >&5
@@ -16607,7 +16614,7 @@
     
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_INCLUDE=$THIS_PREFIX/include
-    THIS_LFLAGS=$THIS_PREFIX/lib
+    THIS_LFLAGS=$THIS_PREFIX/${ABILIB}
   fi
 
     
@@ -16657,7 +16664,7 @@
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
       
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -16670,7 +16677,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBA_SHARED_LIBADD"; then
-      DBA_SHARED_LIBADD="-R$THIS_LFLAGS -L$THIS_LFLAGS $DBA_SHARED_LIBADD"
+      DBA_SHARED_LIBADD="-L$THIS_LFLAGS $DBA_SHARED_LIBADD"
     else
       
   
@@ -16695,7 +16702,7 @@
 
   if test -n "$THIS_LFLAGS"; then
     
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -16708,7 +16715,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$THIS_LFLAGS -L$THIS_LFLAGS $"
+      ="-L$THIS_LFLAGS $"
     else
       
   
@@ -16785,7 +16792,7 @@
     for LIB in db db-3 db3; do
       
   old_LDFLAGS=$LDFLAGS
-  LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+  LDFLAGS="-L$THIS_PREFIX/${ABILIB} $LDFLAGS"
   
       echo $ac_n "checking for db_create in -l$LIB""... $ac_c" 1>&6
 echo "configure:16792: checking for db_create in -l$LIB" >&5
@@ -16838,7 +16845,7 @@
     
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_INCLUDE=$THIS_PREFIX/include
-    THIS_LFLAGS=$THIS_PREFIX/lib
+    THIS_LFLAGS=$THIS_PREFIX/${ABILIB}
   fi
 
     
@@ -16888,7 +16895,7 @@
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
       
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -16901,7 +16908,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBA_SHARED_LIBADD"; then
-      DBA_SHARED_LIBADD="-R$THIS_LFLAGS -L$THIS_LFLAGS $DBA_SHARED_LIBADD"
+      DBA_SHARED_LIBADD="-L$THIS_LFLAGS $DBA_SHARED_LIBADD"
     else
       
   
@@ -16926,7 +16933,7 @@
 
   if test -n "$THIS_LFLAGS"; then
     
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -16939,7 +16946,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$THIS_LFLAGS -L$THIS_LFLAGS $"
+      ="-L$THIS_LFLAGS $"
     else
       
   
@@ -17008,7 +17015,7 @@
     for LIB in db1 dbm c; do
       
   old_LDFLAGS=$LDFLAGS
-  LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+  LDFLAGS="-L$THIS_PREFIX/${ABILIB} $LDFLAGS"
   
       echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
 echo "configure:17015: checking for dbminit in -l$LIB" >&5
@@ -17061,7 +17068,7 @@
     
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_INCLUDE=$THIS_PREFIX/include
-    THIS_LFLAGS=$THIS_PREFIX/lib
+    THIS_LFLAGS=$THIS_PREFIX/${ABILIB}
   fi
 
     
@@ -17111,7 +17118,7 @@
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
       
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -17124,7 +17131,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBA_SHARED_LIBADD"; then
-      DBA_SHARED_LIBADD="-R$THIS_LFLAGS -L$THIS_LFLAGS $DBA_SHARED_LIBADD"
+      DBA_SHARED_LIBADD="-L$THIS_LFLAGS $DBA_SHARED_LIBADD"
     else
       
   
@@ -17149,7 +17156,7 @@
 
   if test -n "$THIS_LFLAGS"; then
     
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -17162,7 +17169,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$THIS_LFLAGS -L$THIS_LFLAGS $"
+      ="-L$THIS_LFLAGS $"
     else
       
   
@@ -17231,7 +17238,7 @@
     for LIB in cdb c; do
       
   old_LDFLAGS=$LDFLAGS
-  LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
+  LDFLAGS="-L$THIS_PREFIX/${ABILIB} $LDFLAGS"
   
       echo $ac_n "checking for cdb_bread in -l$LIB""... $ac_c" 1>&6
 echo "configure:17238: checking for cdb_bread in -l$LIB" >&5
@@ -17284,7 +17291,7 @@
     
   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
     THIS_INCLUDE=$THIS_PREFIX/include
-    THIS_LFLAGS=$THIS_PREFIX/lib
+    THIS_LFLAGS=$THIS_PREFIX/${ABILIB}
   fi
 
     
@@ -17334,7 +17341,7 @@
     DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD"
     if test -n "$THIS_LFLAGS"; then
       
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -17347,7 +17354,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBA_SHARED_LIBADD"; then
-      DBA_SHARED_LIBADD="-R$THIS_LFLAGS -L$THIS_LFLAGS $DBA_SHARED_LIBADD"
+      DBA_SHARED_LIBADD="-L$THIS_LFLAGS $DBA_SHARED_LIBADD"
     else
       
   
@@ -17372,7 +17379,7 @@
 
   if test -n "$THIS_LFLAGS"; then
     
-  if test "$THIS_LFLAGS" != "/usr/lib"; then
+  if test "$THIS_LFLAGS" != "/usr/${ABILIB}"; then
     
   if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then
     ai_p=$THIS_LFLAGS
@@ -17385,7 +17392,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$THIS_LFLAGS -L$THIS_LFLAGS $"
+      ="-L$THIS_LFLAGS $"
     else
       
   
@@ -18039,7 +18046,7 @@
   LIBNAME=Ddb
   LIBSYMBOL=Db_Init
   old_LIBS=$LIBS
-  LIBS="-L$DBPLUS_DIR/lib -lm -ldl -lDmacc -lDracc"
+  LIBS="-L$DBPLUS_DIR/${ABILIB} -lm -ldl -lDmacc -lDracc"
   echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
 echo "configure:18045: checking for $LIBSYMBOL in -l$LIBNAME" >&5
 ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
@@ -18093,22 +18100,22 @@
 
   if test "$ext_shared" = "yes"; then
     DBPLUS_SHARED_LIBADD="-l$LIBNAME $DBPLUS_SHARED_LIBADD"
-    if test -n "$DBPLUS_DIR/lib"; then
+    if test -n "$DBPLUS_DIR/${ABILIB}"; then
       
-  if test "$DBPLUS_DIR/lib" != "/usr/lib"; then
+  if test "$DBPLUS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DBPLUS_DIR/lib" || echo "$DBPLUS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DBPLUS_DIR/lib
+  if test -z "$DBPLUS_DIR/${ABILIB}" || echo "$DBPLUS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DBPLUS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DBPLUS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DBPLUS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBPLUS_SHARED_LIBADD"; then
-      DBPLUS_SHARED_LIBADD="-R$DBPLUS_DIR/lib -L$DBPLUS_DIR/lib $DBPLUS_SHARED_LIBADD"
+      DBPLUS_SHARED_LIBADD="-L$DBPLUS_DIR/${ABILIB} $DBPLUS_SHARED_LIBADD"
     else
       
   
@@ -18131,22 +18138,22 @@
   else
     
 
-  if test -n "$DBPLUS_DIR/lib"; then
+  if test -n "$DBPLUS_DIR/${ABILIB}"; then
     
-  if test "$DBPLUS_DIR/lib" != "/usr/lib"; then
+  if test "$DBPLUS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DBPLUS_DIR/lib" || echo "$DBPLUS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DBPLUS_DIR/lib
+  if test -z "$DBPLUS_DIR/${ABILIB}" || echo "$DBPLUS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DBPLUS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DBPLUS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DBPLUS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$DBPLUS_DIR/lib -L$DBPLUS_DIR/lib $"
+      ="-L$DBPLUS_DIR/${ABILIB} $"
     else
       
   
@@ -18187,22 +18194,22 @@
 
   if test "$ext_shared" = "yes"; then
     DBPLUS_SHARED_LIBADD="-lDmacc $DBPLUS_SHARED_LIBADD"
-    if test -n "$DBPLUS_DIR/lib"; then
+    if test -n "$DBPLUS_DIR/${ABILIB}"; then
       
-  if test "$DBPLUS_DIR/lib" != "/usr/lib"; then
+  if test "$DBPLUS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DBPLUS_DIR/lib" || echo "$DBPLUS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DBPLUS_DIR/lib
+  if test -z "$DBPLUS_DIR/${ABILIB}" || echo "$DBPLUS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DBPLUS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DBPLUS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DBPLUS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBPLUS_SHARED_LIBADD"; then
-      DBPLUS_SHARED_LIBADD="-R$DBPLUS_DIR/lib -L$DBPLUS_DIR/lib $DBPLUS_SHARED_LIBADD"
+      DBPLUS_SHARED_LIBADD="-L$DBPLUS_DIR/${ABILIB} $DBPLUS_SHARED_LIBADD"
     else
       
   
@@ -18225,22 +18232,22 @@
   else
     
 
-  if test -n "$DBPLUS_DIR/lib"; then
+  if test -n "$DBPLUS_DIR/${ABILIB}"; then
     
-  if test "$DBPLUS_DIR/lib" != "/usr/lib"; then
+  if test "$DBPLUS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DBPLUS_DIR/lib" || echo "$DBPLUS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DBPLUS_DIR/lib
+  if test -z "$DBPLUS_DIR/${ABILIB}" || echo "$DBPLUS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DBPLUS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DBPLUS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DBPLUS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$DBPLUS_DIR/lib -L$DBPLUS_DIR/lib $"
+      ="-L$DBPLUS_DIR/${ABILIB} $"
     else
       
   
@@ -18281,22 +18288,22 @@
 
   if test "$ext_shared" = "yes"; then
     DBPLUS_SHARED_LIBADD="-lDracc $DBPLUS_SHARED_LIBADD"
-    if test -n "$DBPLUS_DIR/lib"; then
+    if test -n "$DBPLUS_DIR/${ABILIB}"; then
       
-  if test "$DBPLUS_DIR/lib" != "/usr/lib"; then
+  if test "$DBPLUS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DBPLUS_DIR/lib" || echo "$DBPLUS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DBPLUS_DIR/lib
+  if test -z "$DBPLUS_DIR/${ABILIB}" || echo "$DBPLUS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DBPLUS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DBPLUS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DBPLUS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DBPLUS_SHARED_LIBADD"; then
-      DBPLUS_SHARED_LIBADD="-R$DBPLUS_DIR/lib -L$DBPLUS_DIR/lib $DBPLUS_SHARED_LIBADD"
+      DBPLUS_SHARED_LIBADD="-L$DBPLUS_DIR/${ABILIB} $DBPLUS_SHARED_LIBADD"
     else
       
   
@@ -18319,22 +18326,22 @@
   else
     
 
-  if test -n "$DBPLUS_DIR/lib"; then
+  if test -n "$DBPLUS_DIR/${ABILIB}"; then
     
-  if test "$DBPLUS_DIR/lib" != "/usr/lib"; then
+  if test "$DBPLUS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DBPLUS_DIR/lib" || echo "$DBPLUS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DBPLUS_DIR/lib
+  if test -z "$DBPLUS_DIR/${ABILIB}" || echo "$DBPLUS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DBPLUS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DBPLUS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DBPLUS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DBPLUS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$DBPLUS_DIR/lib -L$DBPLUS_DIR/lib $"
+      ="-L$DBPLUS_DIR/${ABILIB} $"
     else
       
   
@@ -19199,7 +19206,7 @@
   CPPFLAGS=$old_CPPFLAGS
 
 
-  if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
+  if test -f $DOMXML_DIR/${ABILIB}/libxml2.a -o -f $DOMXML_DIR/${ABILIB}/libxml2.$SHLIB_SUFFIX_NAME ; then
     DOM_LIBNAME=xml2
   else
     DOM_LIBNAME=xml
@@ -19245,7 +19252,7 @@
     -L*)
       ac_ii=`echo $ac_i|cut -c 3-`
       
-  if test "$ac_ii" != "/usr/lib"; then
+  if test "$ac_ii" != "/usr/${ABILIB}"; then
     
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
@@ -19258,7 +19265,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "DOMXML_SHARED_LIBADD"; then
-      DOMXML_SHARED_LIBADD="-R$ac_ii -L$ac_ii $DOMXML_SHARED_LIBADD"
+      DOMXML_SHARED_LIBADD="-L$ac_ii $DOMXML_SHARED_LIBADD"
     else
       
   
@@ -19286,22 +19293,22 @@
 
   if test "$ext_shared" = "yes"; then
     DOMXML_SHARED_LIBADD="-l$DOM_LIBNAME $DOMXML_SHARED_LIBADD"
-    if test -n "$DOMXML_DIR/lib"; then
+    if test -n "$DOMXML_DIR/${ABILIB}"; then
       
-  if test "$DOMXML_DIR/lib" != "/usr/lib"; then
+  if test "$DOMXML_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMXML_DIR/lib" || echo "$DOMXML_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMXML_DIR/lib
+  if test -z "$DOMXML_DIR/${ABILIB}" || echo "$DOMXML_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMXML_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMXML_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMXML_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DOMXML_SHARED_LIBADD"; then
-      DOMXML_SHARED_LIBADD="-R$DOMXML_DIR/lib -L$DOMXML_DIR/lib $DOMXML_SHARED_LIBADD"
+      DOMXML_SHARED_LIBADD="-L$DOMXML_DIR/${ABILIB} $DOMXML_SHARED_LIBADD"
     else
       
   
@@ -19324,22 +19331,22 @@
   else
     
 
-  if test -n "$DOMXML_DIR/lib"; then
+  if test -n "$DOMXML_DIR/${ABILIB}"; then
     
-  if test "$DOMXML_DIR/lib" != "/usr/lib"; then
+  if test "$DOMXML_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMXML_DIR/lib" || echo "$DOMXML_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMXML_DIR/lib
+  if test -z "$DOMXML_DIR/${ABILIB}" || echo "$DOMXML_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMXML_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMXML_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMXML_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$DOMXML_DIR/lib -L$DOMXML_DIR/lib $"
+      ="-L$DOMXML_DIR/${ABILIB} $"
     else
       
   
@@ -19417,22 +19424,22 @@
 
   if test "$ext_shared" = "yes"; then
     DOMXML_SHARED_LIBADD="-lz $DOMXML_SHARED_LIBADD"
-    if test -n "$PHP_ZLIB_DIR/lib"; then
+    if test -n "$PHP_ZLIB_DIR/${ABILIB}"; then
       
-  if test "$PHP_ZLIB_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_ZLIB_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_ZLIB_DIR/lib" || echo "$PHP_ZLIB_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_ZLIB_DIR/lib
+  if test -z "$PHP_ZLIB_DIR/${ABILIB}" || echo "$PHP_ZLIB_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_ZLIB_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_ZLIB_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_ZLIB_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DOMXML_SHARED_LIBADD"; then
-      DOMXML_SHARED_LIBADD="-R$PHP_ZLIB_DIR/lib -L$PHP_ZLIB_DIR/lib $DOMXML_SHARED_LIBADD"
+      DOMXML_SHARED_LIBADD="-L$PHP_ZLIB_DIR/${ABILIB} $DOMXML_SHARED_LIBADD"
     else
       
   
@@ -19455,22 +19462,22 @@
   else
     
 
-  if test -n "$PHP_ZLIB_DIR/lib"; then
+  if test -n "$PHP_ZLIB_DIR/${ABILIB}"; then
     
-  if test "$PHP_ZLIB_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_ZLIB_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_ZLIB_DIR/lib" || echo "$PHP_ZLIB_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_ZLIB_DIR/lib
+  if test -z "$PHP_ZLIB_DIR/${ABILIB}" || echo "$PHP_ZLIB_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_ZLIB_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_ZLIB_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_ZLIB_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_ZLIB_DIR/lib -L$PHP_ZLIB_DIR/lib $"
+      ="-L$PHP_ZLIB_DIR/${ABILIB} $"
     else
       
   
@@ -19876,22 +19883,22 @@
 
   if test "$ext_shared" = "yes"; then
     DOMXML_SHARED_LIBADD="-lxslt $DOMXML_SHARED_LIBADD"
-    if test -n "$DOMXSLT_DIR/lib"; then
+    if test -n "$DOMXSLT_DIR/${ABILIB}"; then
       
-  if test "$DOMXSLT_DIR/lib" != "/usr/lib"; then
+  if test "$DOMXSLT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMXSLT_DIR/lib" || echo "$DOMXSLT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMXSLT_DIR/lib
+  if test -z "$DOMXSLT_DIR/${ABILIB}" || echo "$DOMXSLT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMXSLT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMXSLT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMXSLT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMXSLT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMXSLT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DOMXML_SHARED_LIBADD"; then
-      DOMXML_SHARED_LIBADD="-R$DOMXSLT_DIR/lib -L$DOMXSLT_DIR/lib $DOMXML_SHARED_LIBADD"
+      DOMXML_SHARED_LIBADD="-L$DOMXSLT_DIR/${ABILIB} $DOMXML_SHARED_LIBADD"
     else
       
   
@@ -19914,22 +19921,22 @@
   else
     
 
-  if test -n "$DOMXSLT_DIR/lib"; then
+  if test -n "$DOMXSLT_DIR/${ABILIB}"; then
     
-  if test "$DOMXSLT_DIR/lib" != "/usr/lib"; then
+  if test "$DOMXSLT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMXSLT_DIR/lib" || echo "$DOMXSLT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMXSLT_DIR/lib
+  if test -z "$DOMXSLT_DIR/${ABILIB}" || echo "$DOMXSLT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMXSLT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMXSLT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMXSLT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMXSLT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMXSLT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$DOMXSLT_DIR/lib -L$DOMXSLT_DIR/lib $"
+      ="-L$DOMXSLT_DIR/${ABILIB} $"
     else
       
   
@@ -20003,7 +20010,7 @@
     { echo "configure: error: DOMXSLT requires DOMXML. Use --with-dom=<DIR>" 1>&2; exit 1; }
   fi
   
-  if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
+  if test -f $DOMXML_DIR/${ABILIB}/libxml2.a -o -f $DOMXML_DIR/${ABILIB}/libxml2.$SHLIB_SUFFIX_NAME ; then
     DOM_LIBNAME=xml2
   else
     DOM_LIBNAME=xml
@@ -20013,22 +20020,22 @@
 
   if test "$ext_shared" = "yes"; then
     DOMXML_SHARED_LIBADD="-l$DOM_LIBNAME $DOMXML_SHARED_LIBADD"
-    if test -n "$DOMXML_DIR/lib"; then
+    if test -n "$DOMXML_DIR/${ABILIB}"; then
       
-  if test "$DOMXML_DIR/lib" != "/usr/lib"; then
+  if test "$DOMXML_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMXML_DIR/lib" || echo "$DOMXML_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMXML_DIR/lib
+  if test -z "$DOMXML_DIR/${ABILIB}" || echo "$DOMXML_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMXML_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMXML_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMXML_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DOMXML_SHARED_LIBADD"; then
-      DOMXML_SHARED_LIBADD="-R$DOMXML_DIR/lib -L$DOMXML_DIR/lib $DOMXML_SHARED_LIBADD"
+      DOMXML_SHARED_LIBADD="-L$DOMXML_DIR/${ABILIB} $DOMXML_SHARED_LIBADD"
     else
       
   
@@ -20051,22 +20058,22 @@
   else
     
 
-  if test -n "$DOMXML_DIR/lib"; then
+  if test -n "$DOMXML_DIR/${ABILIB}"; then
     
-  if test "$DOMXML_DIR/lib" != "/usr/lib"; then
+  if test "$DOMXML_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMXML_DIR/lib" || echo "$DOMXML_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMXML_DIR/lib
+  if test -z "$DOMXML_DIR/${ABILIB}" || echo "$DOMXML_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMXML_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMXML_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMXML_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$DOMXML_DIR/lib -L$DOMXML_DIR/lib $"
+      ="-L$DOMXML_DIR/${ABILIB} $"
     else
       
   
@@ -20135,27 +20142,27 @@
   fi
 
 
-  if test -f $DOMXML_DIR/lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then
+  if test -f $DOMXML_DIR/${ABILIB}/libxsltbreakpoint.a -o -f $DOMXML_DIR/${ABILIB}/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then
     
 
   if test "$ext_shared" = "yes"; then
     DOMXML_SHARED_LIBADD="-lxsltbreakpoint $DOMXML_SHARED_LIBADD"
-    if test -n "$DOMXML_DIR/lib"; then
+    if test -n "$DOMXML_DIR/${ABILIB}"; then
       
-  if test "$DOMXML_DIR/lib" != "/usr/lib"; then
+  if test "$DOMXML_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMXML_DIR/lib" || echo "$DOMXML_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMXML_DIR/lib
+  if test -z "$DOMXML_DIR/${ABILIB}" || echo "$DOMXML_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMXML_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMXML_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMXML_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DOMXML_SHARED_LIBADD"; then
-      DOMXML_SHARED_LIBADD="-R$DOMXML_DIR/lib -L$DOMXML_DIR/lib $DOMXML_SHARED_LIBADD"
+      DOMXML_SHARED_LIBADD="-L$DOMXML_DIR/${ABILIB} $DOMXML_SHARED_LIBADD"
     else
       
   
@@ -20178,22 +20185,22 @@
   else
     
 
-  if test -n "$DOMXML_DIR/lib"; then
+  if test -n "$DOMXML_DIR/${ABILIB}"; then
     
-  if test "$DOMXML_DIR/lib" != "/usr/lib"; then
+  if test "$DOMXML_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMXML_DIR/lib" || echo "$DOMXML_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMXML_DIR/lib
+  if test -z "$DOMXML_DIR/${ABILIB}" || echo "$DOMXML_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMXML_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMXML_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMXML_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMXML_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$DOMXML_DIR/lib -L$DOMXML_DIR/lib $"
+      ="-L$DOMXML_DIR/${ABILIB} $"
     else
       
   
@@ -20300,22 +20307,22 @@
 
   if test "$ext_shared" = "yes"; then
     DOMXML_SHARED_LIBADD="-lexslt $DOMXML_SHARED_LIBADD"
-    if test -n "$DOMEXSLT_DIR/lib"; then
+    if test -n "$DOMEXSLT_DIR/${ABILIB}"; then
       
-  if test "$DOMEXSLT_DIR/lib" != "/usr/lib"; then
+  if test "$DOMEXSLT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMEXSLT_DIR/lib" || echo "$DOMEXSLT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMEXSLT_DIR/lib
+  if test -z "$DOMEXSLT_DIR/${ABILIB}" || echo "$DOMEXSLT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMEXSLT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMEXSLT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMEXSLT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMEXSLT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMEXSLT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "DOMXML_SHARED_LIBADD"; then
-      DOMXML_SHARED_LIBADD="-R$DOMEXSLT_DIR/lib -L$DOMEXSLT_DIR/lib $DOMXML_SHARED_LIBADD"
+      DOMXML_SHARED_LIBADD="-L$DOMEXSLT_DIR/${ABILIB} $DOMXML_SHARED_LIBADD"
     else
       
   
@@ -20338,22 +20345,22 @@
   else
     
 
-  if test -n "$DOMEXSLT_DIR/lib"; then
+  if test -n "$DOMEXSLT_DIR/${ABILIB}"; then
     
-  if test "$DOMEXSLT_DIR/lib" != "/usr/lib"; then
+  if test "$DOMEXSLT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$DOMEXSLT_DIR/lib" || echo "$DOMEXSLT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$DOMEXSLT_DIR/lib
+  if test -z "$DOMEXSLT_DIR/${ABILIB}" || echo "$DOMEXSLT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$DOMEXSLT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $DOMEXSLT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $DOMEXSLT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$DOMEXSLT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$DOMEXSLT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$DOMEXSLT_DIR/lib -L$DOMEXSLT_DIR/lib $"
+      ="-L$DOMEXSLT_DIR/${ABILIB} $"
     else
       
   
@@ -20981,30 +20988,30 @@
     fi
   fi  
 
-  if test -z "$FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a"; then
-     { echo "configure: error: Could not find $FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a" 1>&2; exit 1; }
+  if test -z "$FBSQL_INSTALLATION_DIR/${ABILIB}/libFBCAccess.a"; then
+     { echo "configure: error: Could not find $FBSQL_INSTALLATION_DIR/${ABILIB}/libFBCAccess.a" 1>&2; exit 1; }
   fi
 
   
 
   if test "$ext_shared" = "yes"; then
-    $FBSQL_INSTALLATION_DIR/lib="-lFBCAccess $$FBSQL_INSTALLATION_DIR/lib"
-    if test -n "$FBSQL_INSTALLATION_DIR/lib"; then
+    $FBSQL_INSTALLATION_DIR/${ABILIB}="-lFBCAccess $$FBSQL_INSTALLATION_DIR/${ABILIB}"
+    if test -n "$FBSQL_INSTALLATION_DIR/${ABILIB}"; then
       
-  if test "$FBSQL_INSTALLATION_DIR/lib" != "/usr/lib"; then
+  if test "$FBSQL_INSTALLATION_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$FBSQL_INSTALLATION_DIR/lib" || echo "$FBSQL_INSTALLATION_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$FBSQL_INSTALLATION_DIR/lib
+  if test -z "$FBSQL_INSTALLATION_DIR/${ABILIB}" || echo "$FBSQL_INSTALLATION_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$FBSQL_INSTALLATION_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $FBSQL_INSTALLATION_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $FBSQL_INSTALLATION_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FBSQL_INSTALLATION_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$FBSQL_INSTALLATION_DIR/${ABILIB}\"`"
   fi
 
-    if test "$ext_shared" = "yes" && test -n "$FBSQL_INSTALLATION_DIR/lib"; then
-      $FBSQL_INSTALLATION_DIR/lib="-R$FBSQL_INSTALLATION_DIR/lib -L$FBSQL_INSTALLATION_DIR/lib $$FBSQL_INSTALLATION_DIR/lib"
+    if test "$ext_shared" = "yes" && test -n "$FBSQL_INSTALLATION_DIR/${ABILIB}"; then
+      $FBSQL_INSTALLATION_DIR/${ABILIB}="-L$FBSQL_INSTALLATION_DIR/${ABILIB} $$FBSQL_INSTALLATION_DIR/${ABILIB}"
     else
       
   
@@ -21027,22 +21034,22 @@
   else
     
 
-  if test -n "$FBSQL_INSTALLATION_DIR/lib"; then
+  if test -n "$FBSQL_INSTALLATION_DIR/${ABILIB}"; then
     
-  if test "$FBSQL_INSTALLATION_DIR/lib" != "/usr/lib"; then
+  if test "$FBSQL_INSTALLATION_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$FBSQL_INSTALLATION_DIR/lib" || echo "$FBSQL_INSTALLATION_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$FBSQL_INSTALLATION_DIR/lib
+  if test -z "$FBSQL_INSTALLATION_DIR/${ABILIB}" || echo "$FBSQL_INSTALLATION_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$FBSQL_INSTALLATION_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $FBSQL_INSTALLATION_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $FBSQL_INSTALLATION_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FBSQL_INSTALLATION_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$FBSQL_INSTALLATION_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$FBSQL_INSTALLATION_DIR/lib -L$FBSQL_INSTALLATION_DIR/lib $"
+      ="-L$FBSQL_INSTALLATION_DIR/${ABILIB} $"
     else
       
   
@@ -21216,7 +21223,7 @@
   for i in fdftk FdfTk; do
     
   save_old_LDFLAGS=$LDFLAGS
-  LDFLAGS="-L$FDFTK_DIR/lib -lm $LDFLAGS"
+  LDFLAGS="-L$FDFTK_DIR/${ABILIB} -lm $LDFLAGS"
   echo $ac_n "checking for FDFOpen in -l$i""... $ac_c" 1>&6
 echo "configure:21222: checking for FDFOpen in -l$i" >&5
 ac_lib_var=`echo $i'_'FDFOpen | sed 'y%./+-%__p_%'`
@@ -21278,22 +21285,22 @@
 
   if test "$ext_shared" = "yes"; then
     FDFTK_SHARED_LIBADD="-l$FDFLIBRARY $FDFTK_SHARED_LIBADD"
-    if test -n "$FDFTK_DIR/lib"; then
+    if test -n "$FDFTK_DIR/${ABILIB}"; then
       
-  if test "$FDFTK_DIR/lib" != "/usr/lib"; then
+  if test "$FDFTK_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$FDFTK_DIR/lib" || echo "$FDFTK_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$FDFTK_DIR/lib
+  if test -z "$FDFTK_DIR/${ABILIB}" || echo "$FDFTK_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$FDFTK_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $FDFTK_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $FDFTK_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FDFTK_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$FDFTK_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "FDFTK_SHARED_LIBADD"; then
-      FDFTK_SHARED_LIBADD="-R$FDFTK_DIR/lib -L$FDFTK_DIR/lib $FDFTK_SHARED_LIBADD"
+      FDFTK_SHARED_LIBADD="-L$FDFTK_DIR/${ABILIB} $FDFTK_SHARED_LIBADD"
     else
       
   
@@ -21316,22 +21323,22 @@
   else
     
 
-  if test -n "$FDFTK_DIR/lib"; then
+  if test -n "$FDFTK_DIR/${ABILIB}"; then
     
-  if test "$FDFTK_DIR/lib" != "/usr/lib"; then
+  if test "$FDFTK_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$FDFTK_DIR/lib" || echo "$FDFTK_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$FDFTK_DIR/lib
+  if test -z "$FDFTK_DIR/${ABILIB}" || echo "$FDFTK_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$FDFTK_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $FDFTK_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $FDFTK_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FDFTK_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$FDFTK_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$FDFTK_DIR/lib -L$FDFTK_DIR/lib $"
+      ="-L$FDFTK_DIR/${ABILIB} $"
     else
       
   
@@ -21916,10 +21923,10 @@
   fi
 
     
-  echo $ac_n "checking for libfribidi.so file in "$PHP_FRIBIDI/lib/"""... $ac_c" 1>&6
-echo "configure:21921: checking for libfribidi.so file in "$PHP_FRIBIDI/lib/"" >&5
-  if test -f "$PHP_FRIBIDI/lib/libfribidi.so" ; then
-    FRIBIDI_LIBDIR=$PHP_FRIBIDI/lib/
+  echo $ac_n "checking for libfribidi.so file in "$PHP_FRIBIDI/${ABILIB}/"""... $ac_c" 1>&6
+echo "configure:21921: checking for libfribidi.so file in "$PHP_FRIBIDI/${ABILIB}/"" >&5
+  if test -f "$PHP_FRIBIDI/${ABILIB}/libfribidi.so" ; then
+    FRIBIDI_LIBDIR=$PHP_FRIBIDI/${ABILIB}/
     echo "$ac_t""found" 1>&6
   else
     echo "$ac_t""missing" 1>&6
@@ -21926,11 +21933,11 @@
   fi
 
   
-  echo $ac_n "checking for glibconfig.h in "usr/lib/glib/include/"""... $ac_c" 1>&6
-echo "configure:21931: checking for glibconfig.h in "usr/lib/glib/include/"" >&5
-  if test -f  /usr/lib/glib/include/glibconfig.h ; then
+  echo $ac_n "checking for glibconfig.h in "usr/${ABILIB}/glib/include/"""... $ac_c" 1>&6
+echo "configure:21931: checking for glibconfig.h in "usr/${ABILIB}/glib/include/"" >&5
+  if test -f  /usr/${ABILIB}/glib/include/glibconfig.h ; then
     echo "$ac_t""found" 1>&6
-    GLIB_INCDIR=/usr/lib/glib/include/
+    GLIB_INCDIR=/usr/${ABILIB}/glib/include/
   else
     echo "$ac_t""missing" 1>&6
   fi
@@ -22026,7 +22033,7 @@
     FRIBIDI_SHARED_LIBADD="-lfribidi $FRIBIDI_SHARED_LIBADD"
     if test -n ""$FRIBIDI_LIBDIR""; then
       
-  if test ""$FRIBIDI_LIBDIR"" != "/usr/lib"; then
+  if test ""$FRIBIDI_LIBDIR"" != "/usr/${ABILIB}"; then
     
   if test -z ""$FRIBIDI_LIBDIR"" || echo ""$FRIBIDI_LIBDIR"" | grep '^/' >/dev/null ; then
     ai_p="$FRIBIDI_LIBDIR"
@@ -22064,7 +22071,7 @@
 
   if test -n ""$FRIBIDI_LIBDIR""; then
     
-  if test ""$FRIBIDI_LIBDIR"" != "/usr/lib"; then
+  if test ""$FRIBIDI_LIBDIR"" != "/usr/${ABILIB}"; then
     
   if test -z ""$FRIBIDI_LIBDIR"" || echo ""$FRIBIDI_LIBDIR"" | grep '^/' >/dev/null ; then
     ai_p="$FRIBIDI_LIBDIR"
@@ -22995,8 +23002,8 @@
 
   if test "$PHP_JPEG_DIR" != "no"; then
 
-    for i in /usr /usr/local $PHP_JPEG_DIR; do
-      test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i
+    for i in $PHP_JPEG_DIR /usr /usr/local ; do
+      test -f $i/${ABILIB}/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/${ABILIB}/libjpeg.a && GD_JPEG_DIR=$i
     done
 
     if test -z "$GD_JPEG_DIR"; then
@@ -23006,10 +23013,10 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$GD_JPEG_DIR/lib
+      -L$GD_JPEG_DIR/${ABILIB}
      $LDFLAGS"
   echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:23013: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:23330: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -23050,22 +23057,22 @@
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-ljpeg $GD_SHARED_LIBADD"
-    if test -n "$GD_JPEG_DIR/lib"; then
+    if test -n "$GD_JPEG_DIR/${ABILIB}"; then
       
-  if test "$GD_JPEG_DIR/lib" != "/usr/lib"; then
+  if test "$GD_JPEG_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GD_JPEG_DIR/lib" || echo "$GD_JPEG_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GD_JPEG_DIR/lib
+  if test -z "$GD_JPEG_DIR/${ABILIB}" || echo "$GD_JPEG_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GD_JPEG_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GD_JPEG_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GD_JPEG_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R$GD_JPEG_DIR/lib -L$GD_JPEG_DIR/lib $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-L$GD_JPEG_DIR/${ABILIB} $GD_SHARED_LIBADD"
     else
       
   
@@ -23088,22 +23095,22 @@
   else
     
 
-  if test -n "$GD_JPEG_DIR/lib"; then
+  if test -n "$GD_JPEG_DIR/${ABILIB}"; then
     
-  if test "$GD_JPEG_DIR/lib" != "/usr/lib"; then
+  if test "$GD_JPEG_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GD_JPEG_DIR/lib" || echo "$GD_JPEG_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GD_JPEG_DIR/lib
+  if test -z "$GD_JPEG_DIR/${ABILIB}" || echo "$GD_JPEG_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GD_JPEG_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GD_JPEG_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GD_JPEG_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$GD_JPEG_DIR/lib -L$GD_JPEG_DIR/lib $"
+      ="-L$GD_JPEG_DIR/${ABILIB} $"
     else
       
   
@@ -23161,7 +23168,7 @@
 
 if test -n "for the location of libpng"; then
   echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
-echo "configure:23165: checking for the location of libpng" >&5
+echo "configure:23482: checking for the location of libpng" >&5
 fi
 # Check whether --with-png-dir or --without-png-dir was given.
 if test "${with_png_dir+set}" = set; then
@@ -23208,8 +23215,8 @@
 
   if test "$PHP_PNG_DIR" != "no"; then
 
-    for i in /usr /usr/local $PHP_PNG_DIR; do
-      test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i
+    for i in $PHP_PNG_DIR /usr /usr/local ; do
+      test -f $i/${ABILIB}/libpng.$SHLIB_SUFFIX_NAME -o -f $i/${ABILIB}/libpng.a && GD_PNG_DIR=$i
     done
 
     if test -z "$GD_PNG_DIR"; then
@@ -23223,10 +23230,10 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib
+      -L$PHP_ZLIB_DIR/${ABILIB} -lz -L$GD_PNG_DIR/${ABILIB}
      $LDFLAGS"
   echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
-echo "configure:23230: checking for png_write_image in -lpng" >&5
+echo "configure:23547: checking for png_write_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -23234,7 +23241,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 23238 "configure"
+#line 23555 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -23245,7 +23252,7 @@
 png_write_image()
 ; return 0; }
 EOF
-if { (eval echo configure:23249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -23267,22 +23274,22 @@
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lz $GD_SHARED_LIBADD"
-    if test -n "$PHP_ZLIB_DIR/lib"; then
+    if test -n "$PHP_ZLIB_DIR/${ABILIB}"; then
       
-  if test "$PHP_ZLIB_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_ZLIB_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_ZLIB_DIR/lib" || echo "$PHP_ZLIB_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_ZLIB_DIR/lib
+  if test -z "$PHP_ZLIB_DIR/${ABILIB}" || echo "$PHP_ZLIB_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_ZLIB_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_ZLIB_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_ZLIB_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R$PHP_ZLIB_DIR/lib -L$PHP_ZLIB_DIR/lib $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-L$PHP_ZLIB_DIR/${ABILIB} $GD_SHARED_LIBADD"
     else
       
   
@@ -23305,22 +23312,22 @@
   else
     
 
-  if test -n "$PHP_ZLIB_DIR/lib"; then
+  if test -n "$PHP_ZLIB_DIR/${ABILIB}"; then
     
-  if test "$PHP_ZLIB_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_ZLIB_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_ZLIB_DIR/lib" || echo "$PHP_ZLIB_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_ZLIB_DIR/lib
+  if test -z "$PHP_ZLIB_DIR/${ABILIB}" || echo "$PHP_ZLIB_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_ZLIB_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_ZLIB_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_ZLIB_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_ZLIB_DIR/lib -L$PHP_ZLIB_DIR/lib $"
+      ="-L$PHP_ZLIB_DIR/${ABILIB} $"
     else
       
   
@@ -23361,22 +23368,22 @@
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lpng $GD_SHARED_LIBADD"
-    if test -n "$GD_PNG_DIR/lib"; then
+    if test -n "$GD_PNG_DIR/${ABILIB}"; then
       
-  if test "$GD_PNG_DIR/lib" != "/usr/lib"; then
+  if test "$GD_PNG_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GD_PNG_DIR/lib" || echo "$GD_PNG_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GD_PNG_DIR/lib
+  if test -z "$GD_PNG_DIR/${ABILIB}" || echo "$GD_PNG_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GD_PNG_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GD_PNG_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GD_PNG_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R$GD_PNG_DIR/lib -L$GD_PNG_DIR/lib $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-L$GD_PNG_DIR/${ABILIB} $GD_SHARED_LIBADD"
     else
       
   
@@ -23399,22 +23406,22 @@
   else
     
 
-  if test -n "$GD_PNG_DIR/lib"; then
+  if test -n "$GD_PNG_DIR/${ABILIB}"; then
     
-  if test "$GD_PNG_DIR/lib" != "/usr/lib"; then
+  if test "$GD_PNG_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GD_PNG_DIR/lib" || echo "$GD_PNG_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GD_PNG_DIR/lib
+  if test -z "$GD_PNG_DIR/${ABILIB}" || echo "$GD_PNG_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GD_PNG_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GD_PNG_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GD_PNG_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$GD_PNG_DIR/lib -L$GD_PNG_DIR/lib $"
+      ="-L$GD_PNG_DIR/${ABILIB} $"
     else
       
   
@@ -23520,8 +23527,8 @@
 
   if test "$PHP_XPM_DIR" != "no"; then
 
-    for i in /usr /usr/local /usr/X11R6 $PHP_XPM_DIR; do
-      test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i
+    for i in $PHP_XPM_DIR /usr /usr/local /usr/X11R6 ; do
+      test -f $i/${ABILIB}/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/${ABILIB}/libXpm.a && GD_XPM_DIR=$i
     done
 
     if test -z "$GD_XPM_DIR"; then
@@ -23531,7 +23538,7 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$GD_XPM_DIR/lib -lX11
+      -L$GD_XPM_DIR/${ABILIB} -lX11
      $LDFLAGS"
   echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
 echo "configure:23538: checking for XpmFreeXpmImage in -lXpm" >&5
@@ -23575,22 +23582,22 @@
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lXpm $GD_SHARED_LIBADD"
-    if test -n "$GD_XPM_DIR/lib"; then
+    if test -n "$GD_XPM_DIR/${ABILIB}"; then
       
-  if test "$GD_XPM_DIR/lib" != "/usr/lib"; then
+  if test "$GD_XPM_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GD_XPM_DIR/lib" || echo "$GD_XPM_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GD_XPM_DIR/lib
+  if test -z "$GD_XPM_DIR/${ABILIB}" || echo "$GD_XPM_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GD_XPM_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GD_XPM_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GD_XPM_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R$GD_XPM_DIR/lib -L$GD_XPM_DIR/lib $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-L$GD_XPM_DIR/${ABILIB} $GD_SHARED_LIBADD"
     else
       
   
@@ -23613,22 +23620,22 @@
   else
     
 
-  if test -n "$GD_XPM_DIR/lib"; then
+  if test -n "$GD_XPM_DIR/${ABILIB}"; then
     
-  if test "$GD_XPM_DIR/lib" != "/usr/lib"; then
+  if test "$GD_XPM_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GD_XPM_DIR/lib" || echo "$GD_XPM_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GD_XPM_DIR/lib
+  if test -z "$GD_XPM_DIR/${ABILIB}" || echo "$GD_XPM_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GD_XPM_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GD_XPM_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GD_XPM_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$GD_XPM_DIR/lib -L$GD_XPM_DIR/lib $"
+      ="-L$GD_XPM_DIR/${ABILIB} $"
     else
       
   
@@ -23669,22 +23676,22 @@
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lX11 $GD_SHARED_LIBADD"
-    if test -n "$GD_XPM_DIR/lib"; then
+    if test -n "$GD_XPM_DIR/${ABILIB}"; then
       
-  if test "$GD_XPM_DIR/lib" != "/usr/lib"; then
+  if test "$GD_XPM_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GD_XPM_DIR/lib" || echo "$GD_XPM_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GD_XPM_DIR/lib
+  if test -z "$GD_XPM_DIR/${ABILIB}" || echo "$GD_XPM_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GD_XPM_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GD_XPM_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GD_XPM_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R$GD_XPM_DIR/lib -L$GD_XPM_DIR/lib $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-L$GD_XPM_DIR/${ABILIB} $GD_SHARED_LIBADD"
     else
       
   
@@ -23707,23 +23714,22 @@
   else
     
 
-  if test -n "$GD_XPM_DIR/lib"; then
+  if test -n "$GD_XPM_DIR/${ABILIB}"; then
     
-  if test "$GD_XPM_DIR/lib" != "/usr/lib"; then
+  if test "$GD_XPM_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GD_XPM_DIR/lib" || echo "$GD_XPM_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GD_XPM_DIR/lib
+  if test -z "$GD_XPM_DIR/${ABILIB}" || echo "$GD_XPM_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GD_XPM_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GD_XPM_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GD_XPM_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$GD_XPM_DIR/lib -L$GD_XPM_DIR/lib $"
-    else
+      ="-L$GD_XPM_DIR/${ABILIB} $" else
       
   
   unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
@@ -23826,7 +23832,7 @@
 
 
   if test "$PHP_FREETYPE_DIR" != "no"; then
-    for i in /usr /usr/local $PHP_FREETYPE_DIR; do
+    for i in $PHP_FREETYPE_DIR /usr /usr/local ; do
       if test -f "$i/include/freetype2/freetype/freetype.h"; then
         FREETYPE2_DIR=$i
         FREETYPE2_INC_DIR=$i/include/freetype2/freetype
@@ -23838,22 +23844,22 @@
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lfreetype $GD_SHARED_LIBADD"
-    if test -n "$FREETYPE2_DIR/lib"; then
+    if test -n "$FREETYPE2_DIR/${ABILIB}"; then
       
-  if test "$FREETYPE2_DIR/lib" != "/usr/lib"; then
+  if test "$FREETYPE2_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$FREETYPE2_DIR/lib" || echo "$FREETYPE2_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$FREETYPE2_DIR/lib
+  if test -z "$FREETYPE2_DIR/${ABILIB}" || echo "$FREETYPE2_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$FREETYPE2_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $FREETYPE2_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $FREETYPE2_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R$FREETYPE2_DIR/lib -L$FREETYPE2_DIR/lib $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-L$FREETYPE2_DIR/${ABILIB} $GD_SHARED_LIBADD"
     else
       
   
@@ -23876,22 +23882,22 @@
   else
     
 
-  if test -n "$FREETYPE2_DIR/lib"; then
+  if test -n "$FREETYPE2_DIR/${ABILIB}"; then
     
-  if test "$FREETYPE2_DIR/lib" != "/usr/lib"; then
+  if test "$FREETYPE2_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$FREETYPE2_DIR/lib" || echo "$FREETYPE2_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$FREETYPE2_DIR/lib
+  if test -z "$FREETYPE2_DIR/${ABILIB}" || echo "$FREETYPE2_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$FREETYPE2_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $FREETYPE2_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $FREETYPE2_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$FREETYPE2_DIR/lib -L$FREETYPE2_DIR/lib $"
+      ="-L$FREETYPE2_DIR/${ABILIB} $"
     else
       
   
@@ -24047,22 +24053,22 @@
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lttf $GD_SHARED_LIBADD"
-    if test -n "$TTF_DIR/lib"; then
+    if test -n "$TTF_DIR/${ABILIB}"; then
       
-  if test "$TTF_DIR/lib" != "/usr/lib"; then
+  if test "$TTF_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$TTF_DIR/lib" || echo "$TTF_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$TTF_DIR/lib
+  if test -z "$TTF_DIR/${ABILIB}" || echo "$TTF_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$TTF_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $TTF_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $TTF_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$TTF_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$TTF_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R$TTF_DIR/lib -L$TTF_DIR/lib $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-L$TTF_DIR/${ABILIB} $GD_SHARED_LIBADD"
     else
       
   
@@ -24085,22 +24091,22 @@
   else
     
 
-  if test -n "$TTF_DIR/lib"; then
+  if test -n "$TTF_DIR/${ABILIB}"; then
     
-  if test "$TTF_DIR/lib" != "/usr/lib"; then
+  if test "$TTF_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$TTF_DIR/lib" || echo "$TTF_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$TTF_DIR/lib
+  if test -z "$TTF_DIR/${ABILIB}" || echo "$TTF_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$TTF_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $TTF_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $TTF_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$TTF_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$TTF_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$TTF_DIR/lib -L$TTF_DIR/lib $"
+      ="-L$TTF_DIR/${ABILIB} $"
     else
       
   
@@ -24240,7 +24246,7 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$GD_T1_DIR/lib
+      -L$GD_T1_DIR/${ABILIB}
      $LDFLAGS"
   echo $ac_n "checking for T1_LoadFont in -lt1""... $ac_c" 1>&6
 echo "configure:24247: checking for T1_LoadFont in -lt1" >&5
@@ -24319,22 +24325,22 @@
 
   if test "$ext_shared" = "yes"; then
     GD_SHARED_LIBADD="-lt1 $GD_SHARED_LIBADD"
-    if test -n ""$GD_T1_DIR/lib""; then
+    if test -n ""$GD_T1_DIR/${ABILIB}""; then
       
-  if test ""$GD_T1_DIR/lib"" != "/usr/lib"; then
+  if test ""$GD_T1_DIR/${ABILIB}"" != "/usr/${ABILIB}"; then
     
-  if test -z ""$GD_T1_DIR/lib"" || echo ""$GD_T1_DIR/lib"" | grep '^/' >/dev/null ; then
-    ai_p="$GD_T1_DIR/lib"
+  if test -z ""$GD_T1_DIR/${ABILIB}"" || echo ""$GD_T1_DIR/${ABILIB}"" | grep '^/' >/dev/null ; then
+    ai_p="$GD_T1_DIR/${ABILIB}"
   else
     
-    ep_dir="`echo "$GD_T1_DIR/lib"|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo "$GD_T1_DIR/${ABILIB}"|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \""$GD_T1_DIR/lib"\"`"
+    ai_p="$ep_realdir/`basename \""$GD_T1_DIR/${ABILIB}"\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R"$GD_T1_DIR/lib" -L"$GD_T1_DIR/lib" $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-R"$GD_T1_DIR/${ABILIB}" -L"$GD_T1_DIR/${ABILIB}" $GD_SHARED_LIBADD"
     else
       
   
@@ -24357,22 +24363,22 @@
   else
     
 
-  if test -n ""$GD_T1_DIR/lib""; then
+  if test -n ""$GD_T1_DIR/${ABILIB}""; then
     
-  if test ""$GD_T1_DIR/lib"" != "/usr/lib"; then
+  if test ""$GD_T1_DIR/${ABILIB}"" != "/usr/${ABILIB}"; then
     
-  if test -z ""$GD_T1_DIR/lib"" || echo ""$GD_T1_DIR/lib"" | grep '^/' >/dev/null ; then
-    ai_p="$GD_T1_DIR/lib"
+  if test -z ""$GD_T1_DIR/${ABILIB}"" || echo ""$GD_T1_DIR/${ABILIB}"" | grep '^/' >/dev/null ; then
+    ai_p="$GD_T1_DIR/${ABILIB}"
   else
     
-    ep_dir="`echo "$GD_T1_DIR/lib"|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo "$GD_T1_DIR/${ABILIB}"|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \""$GD_T1_DIR/lib"\"`"
+    ai_p="$ep_realdir/`basename \""$GD_T1_DIR/${ABILIB}"\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R"$GD_T1_DIR/lib" -L"$GD_T1_DIR/lib" $"
+      ="-R"$GD_T1_DIR/${ABILIB}" -L"$GD_T1_DIR/${ABILIB}" $"
     else
       
   
@@ -24435,7 +24441,7 @@
       test -f $j/$i/gd.h && GD_INCLUDE=$j/$i
     done
 
-    for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do
+    for i in ${ABILIB}/gd1.3 ${ABILIB}/gd ${ABILIB} gd1.3 gd ""; do
       test -f $j/$i/libgd.$SHLIB_SUFFIX_NAME -o -f $j/$i/libgd.a && GD_LIB=$j/$i
     done
   done
@@ -24447,7 +24453,7 @@
     GD_SHARED_LIBADD="-lgd $GD_SHARED_LIBADD"
     if test -n "$GD_LIB"; then
       
-  if test "$GD_LIB" != "/usr/lib"; then
+  if test "$GD_LIB" != "/usr/${ABILIB}"; then
     
   if test -z "$GD_LIB" || echo "$GD_LIB" | grep '^/' >/dev/null ; then
     ai_p=$GD_LIB
@@ -24460,7 +24466,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "GD_SHARED_LIBADD"; then
-      GD_SHARED_LIBADD="-R$GD_LIB -L$GD_LIB $GD_SHARED_LIBADD"
+      GD_SHARED_LIBADD="-L$GD_LIB $GD_SHARED_LIBADD"
     else
       
   
@@ -24485,7 +24491,7 @@
 
   if test -n "$GD_LIB"; then
     
-  if test "$GD_LIB" != "/usr/lib"; then
+  if test "$GD_LIB" != "/usr/${ABILIB}"; then
     
   if test -z "$GD_LIB" || echo "$GD_LIB" | grep '^/' >/dev/null ; then
     ai_p=$GD_LIB
@@ -24498,7 +24504,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$GD_LIB -L$GD_LIB $"
+      ="-L$GD_LIB $"
     else
       
   
@@ -25613,7 +25619,7 @@
     { echo "configure: error: Cannot locate header file libintl.h" 1>&2; exit 1; }
   fi
 
-  GETTEXT_LIBDIR=$GETTEXT_DIR/lib
+  GETTEXT_LIBDIR=$GETTEXT_DIR/${ABILIB}
   GETTEXT_INCDIR=$GETTEXT_DIR/include
   
   O_LDFLAGS=$LDFLAGS
@@ -25930,7 +25936,7 @@
     GETTEXT_SHARED_LIBADD="-l$GETTEXT_LIBS $GETTEXT_SHARED_LIBADD"
     if test -n "$GETTEXT_LIBDIR"; then
       
-  if test "$GETTEXT_LIBDIR" != "/usr/lib"; then
+  if test "$GETTEXT_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GETTEXT_LIBDIR
@@ -25943,7 +25949,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "GETTEXT_SHARED_LIBADD"; then
-      GETTEXT_SHARED_LIBADD="-R$GETTEXT_LIBDIR -L$GETTEXT_LIBDIR $GETTEXT_SHARED_LIBADD"
+      GETTEXT_SHARED_LIBADD="-L$GETTEXT_LIBDIR $GETTEXT_SHARED_LIBADD"
     else
       
   
@@ -25968,7 +25974,7 @@
 
   if test -n "$GETTEXT_LIBDIR"; then
     
-  if test "$GETTEXT_LIBDIR" != "/usr/lib"; then
+  if test "$GETTEXT_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$GETTEXT_LIBDIR
@@ -25981,7 +25987,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$GETTEXT_LIBDIR -L$GETTEXT_LIBDIR $"
+      ="-L$GETTEXT_LIBDIR $"
     else
       
   
@@ -26536,22 +26542,22 @@
 
   if test "$ext_shared" = "yes"; then
     GMP_SHARED_LIBADD="-lgmp $GMP_SHARED_LIBADD"
-    if test -n "$GMP_DIR/lib"; then
+    if test -n "$GMP_DIR/${ABILIB}"; then
       
-  if test "$GMP_DIR/lib" != "/usr/lib"; then
+  if test "$GMP_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GMP_DIR/lib" || echo "$GMP_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GMP_DIR/lib
+  if test -z "$GMP_DIR/${ABILIB}" || echo "$GMP_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GMP_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GMP_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GMP_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GMP_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GMP_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "GMP_SHARED_LIBADD"; then
-      GMP_SHARED_LIBADD="-R$GMP_DIR/lib -L$GMP_DIR/lib $GMP_SHARED_LIBADD"
+      GMP_SHARED_LIBADD="-L$GMP_DIR/${ABILIB} $GMP_SHARED_LIBADD"
     else
       
   
@@ -26574,22 +26580,22 @@
   else
     
 
-  if test -n "$GMP_DIR/lib"; then
+  if test -n "$GMP_DIR/${ABILIB}"; then
     
-  if test "$GMP_DIR/lib" != "/usr/lib"; then
+  if test "$GMP_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$GMP_DIR/lib" || echo "$GMP_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$GMP_DIR/lib
+  if test -z "$GMP_DIR/${ABILIB}" || echo "$GMP_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$GMP_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $GMP_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $GMP_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GMP_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$GMP_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$GMP_DIR/lib -L$GMP_DIR/lib $"
+      ="-L$GMP_DIR/${ABILIB} $"
     else
       
   
@@ -26959,7 +26965,7 @@
     ICAP_SHARED_LIBADD="-licap $ICAP_SHARED_LIBADD"
     if test -n "$ICAP_DIR"; then
       
-  if test "$ICAP_DIR" != "/usr/lib"; then
+  if test "$ICAP_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$ICAP_DIR" || echo "$ICAP_DIR" | grep '^/' >/dev/null ; then
     ai_p=$ICAP_DIR
@@ -26972,7 +26978,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "ICAP_SHARED_LIBADD"; then
-      ICAP_SHARED_LIBADD="-R$ICAP_DIR -L$ICAP_DIR $ICAP_SHARED_LIBADD"
+      ICAP_SHARED_LIBADD="-L$ICAP_DIR $ICAP_SHARED_LIBADD"
     else
       
   
@@ -26997,7 +27003,7 @@
 
   if test -n "$ICAP_DIR"; then
     
-  if test "$ICAP_DIR" != "/usr/lib"; then
+  if test "$ICAP_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$ICAP_DIR" || echo "$ICAP_DIR" | grep '^/' >/dev/null ; then
     ai_p=$ICAP_DIR
@@ -27010,7 +27016,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ICAP_DIR -L$ICAP_DIR $"
+      ="-L$ICAP_DIR $"
     else
       
   
@@ -27445,13 +27451,13 @@
       { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
     fi
   
-    if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
-       test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+    if test -f $ICONV_DIR/${ABILIB}/lib$iconv_lib_name.a ||
+       test -f $ICONV_DIR/${ABILIB}/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
       
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-        -L$ICONV_DIR/lib
+        -L$ICONV_DIR/${ABILIB}
        $LDFLAGS"
   echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
 echo "configure:27458: checking for libiconv in -l$iconv_lib_name" >&5
@@ -27506,7 +27512,7 @@
         
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-          -L$ICONV_DIR/lib
+          -L$ICONV_DIR/${ABILIB}
          $LDFLAGS"
   echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
 echo "configure:27513: checking for iconv in -l$iconv_lib_name" >&5
@@ -27574,22 +27580,22 @@
 
   if test "$ext_shared" = "yes"; then
     ICONV_SHARED_LIBADD="-l$iconv_lib_name $ICONV_SHARED_LIBADD"
-    if test -n "$ICONV_DIR/lib"; then
+    if test -n "$ICONV_DIR/${ABILIB}"; then
       
-  if test "$ICONV_DIR/lib" != "/usr/lib"; then
+  if test "$ICONV_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ICONV_DIR/lib" || echo "$ICONV_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ICONV_DIR/lib
+  if test -z "$ICONV_DIR/${ABILIB}" || echo "$ICONV_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ICONV_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ICONV_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ICONV_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ICONV_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ICONV_SHARED_LIBADD"; then
-      ICONV_SHARED_LIBADD="-R$ICONV_DIR/lib -L$ICONV_DIR/lib $ICONV_SHARED_LIBADD"
+      ICONV_SHARED_LIBADD="-L$ICONV_DIR/${ABILIB} $ICONV_SHARED_LIBADD"
     else
       
   
@@ -27612,22 +27618,22 @@
   else
     
 
-  if test -n "$ICONV_DIR/lib"; then
+  if test -n "$ICONV_DIR/${ABILIB}"; then
     
-  if test "$ICONV_DIR/lib" != "/usr/lib"; then
+  if test "$ICONV_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ICONV_DIR/lib" || echo "$ICONV_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ICONV_DIR/lib
+  if test -z "$ICONV_DIR/${ABILIB}" || echo "$ICONV_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ICONV_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ICONV_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ICONV_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ICONV_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ICONV_DIR/lib -L$ICONV_DIR/lib $"
+      ="-L$ICONV_DIR/${ABILIB} $"
     else
       
   
@@ -28397,17 +28403,17 @@
 
     if test -r "$IMAP_DIR/c-client/c-client.a"; then
       ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
-    elif test -r "$IMAP_DIR/lib/c-client.a"; then
-      ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1
+    elif test -r "$IMAP_DIR/${ABILIB}/c-client.a"; then
+      ln -s "$IMAP_DIR/${ABILIB}/c-client.a" "$IMAP_DIR/${ABILIB}/libc-client.a" >/dev/null 2>&1
     fi
 
     for lib in c-client4 c-client imap; do
       IMAP_LIB=$lib
       
-  str="$IMAP_DIR/lib/lib$lib.*"
+  str="$IMAP_DIR/${ABILIB}/lib$lib.*"
   for i in `echo $str`; do
     if test -r $i; then
-      IMAP_LIBDIR=$IMAP_DIR/lib
+      IMAP_LIBDIR=$IMAP_DIR/${ABILIB}
       break 2
     fi
   done
@@ -28459,7 +28465,7 @@
   fi
 
     
-  if test "$IMAP_LIBDIR" != "/usr/lib"; then
+  if test "$IMAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$IMAP_LIBDIR" || echo "$IMAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$IMAP_LIBDIR
@@ -28472,7 +28478,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "IMAP_SHARED_LIBADD"; then
-      IMAP_SHARED_LIBADD="-R$IMAP_LIBDIR -L$IMAP_LIBDIR $IMAP_SHARED_LIBADD"
+      IMAP_SHARED_LIBADD="-L$IMAP_LIBDIR $IMAP_SHARED_LIBADD"
     else
       
   
@@ -28542,20 +28548,20 @@
 EOF
 
     
-  if test "$PHP_KERBEROS/lib" != "/usr/lib"; then
+  if test "$PHP_KERBEROS/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_KERBEROS/lib" || echo "$PHP_KERBEROS/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_KERBEROS/lib
+  if test -z "$PHP_KERBEROS/${ABILIB}" || echo "$PHP_KERBEROS/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_KERBEROS/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_KERBEROS/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_KERBEROS/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_KERBEROS/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_KERBEROS/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "IMAP_SHARED_LIBADD"; then
-      IMAP_SHARED_LIBADD="-R$PHP_KERBEROS/lib -L$PHP_KERBEROS/lib $IMAP_SHARED_LIBADD"
+      IMAP_SHARED_LIBADD="-L$PHP_KERBEROS/${ABILIB} $IMAP_SHARED_LIBADD"
     else
       
   
@@ -28726,20 +28732,20 @@
 EOF
 
     
-  if test "$PHP_IMAP_SSL/lib" != "/usr/lib"; then
+  if test "$PHP_IMAP_SSL/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_IMAP_SSL/lib" || echo "$PHP_IMAP_SSL/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_IMAP_SSL/lib
+  if test -z "$PHP_IMAP_SSL/${ABILIB}" || echo "$PHP_IMAP_SSL/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_IMAP_SSL/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_IMAP_SSL/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_IMAP_SSL/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_IMAP_SSL/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_IMAP_SSL/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "IMAP_SHARED_LIBADD"; then
-      IMAP_SHARED_LIBADD="-R$PHP_IMAP_SSL/lib -L$PHP_IMAP_SSL/lib $IMAP_SHARED_LIBADD"
+      IMAP_SHARED_LIBADD="-L$PHP_IMAP_SSL/${ABILIB} $IMAP_SHARED_LIBADD"
     else
       
   
@@ -28816,7 +28822,7 @@
     old_LIBS=$LIBS
     LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB"
     if test $PHP_KERBEROS != "no"; then
-      LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+      LIBS="$LIBS -L$PHP_KERBEROS/${ABILIB} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
     fi
 
     if test "$cross_compiling" = yes; then
@@ -29167,20 +29173,20 @@
   fi
 
     
-  if test "$INFORMIXDIR/lib" != "/usr/lib"; then
+  if test "$INFORMIXDIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$INFORMIXDIR/lib" || echo "$INFORMIXDIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$INFORMIXDIR/lib
+  if test -z "$INFORMIXDIR/${ABILIB}" || echo "$INFORMIXDIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$INFORMIXDIR/${ABILIB}
   else
     
-    ep_dir="`echo $INFORMIXDIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $INFORMIXDIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$INFORMIXDIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$INFORMIXDIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "INFORMIX_SHARED_LIBADD"; then
-      INFORMIX_SHARED_LIBADD="-R$INFORMIXDIR/lib -L$INFORMIXDIR/lib $INFORMIX_SHARED_LIBADD"
+      INFORMIX_SHARED_LIBADD="-L$INFORMIXDIR/${ABILIB} $INFORMIX_SHARED_LIBADD"
     else
       
   
@@ -29200,20 +29206,20 @@
   fi
 
     
-  if test "$INFORMIXDIR/lib/esql" != "/usr/lib"; then
+  if test "$INFORMIXDIR/${ABILIB}/esql" != "/usr/${ABILIB}"; then
     
-  if test -z "$INFORMIXDIR/lib/esql" || echo "$INFORMIXDIR/lib/esql" | grep '^/' >/dev/null ; then
-    ai_p=$INFORMIXDIR/lib/esql
+  if test -z "$INFORMIXDIR/${ABILIB}/esql" || echo "$INFORMIXDIR/${ABILIB}/esql" | grep '^/' >/dev/null ; then
+    ai_p=$INFORMIXDIR/${ABILIB}/esql
   else
     
-    ep_dir="`echo $INFORMIXDIR/lib/esql|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $INFORMIXDIR/${ABILIB}/esql|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$INFORMIXDIR/lib/esql\"`"
+    ai_p="$ep_realdir/`basename \"$INFORMIXDIR/${ABILIB}/esql\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "INFORMIX_SHARED_LIBADD"; then
-      INFORMIX_SHARED_LIBADD="-R$INFORMIXDIR/lib/esql -L$INFORMIXDIR/lib/esql $INFORMIX_SHARED_LIBADD"
+      INFORMIX_SHARED_LIBADD="-L$INFORMIXDIR/${ABILIB}/esql $INFORMIX_SHARED_LIBADD"
     else
       
   
@@ -29268,20 +29274,20 @@
   fi
 
     
-  if test "$PHP_INFORMIX/lib" != "/usr/lib"; then
+  if test "$PHP_INFORMIX/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_INFORMIX/lib" || echo "$PHP_INFORMIX/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_INFORMIX/lib
+  if test -z "$PHP_INFORMIX/${ABILIB}" || echo "$PHP_INFORMIX/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_INFORMIX/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_INFORMIX/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_INFORMIX/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_INFORMIX/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_INFORMIX/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "INFORMIX_SHARED_LIBADD"; then
-      INFORMIX_SHARED_LIBADD="-R$PHP_INFORMIX/lib -L$PHP_INFORMIX/lib $INFORMIX_SHARED_LIBADD"
+      INFORMIX_SHARED_LIBADD="-L$PHP_INFORMIX/${ABILIB} $INFORMIX_SHARED_LIBADD"
     else
       
   
@@ -29301,20 +29307,20 @@
   fi
 
     
-  if test "$PHP_INFORMIX/lib/esql" != "/usr/lib"; then
+  if test "$PHP_INFORMIX/${ABILIB}/esql" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_INFORMIX/lib/esql" || echo "$PHP_INFORMIX/lib/esql" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_INFORMIX/lib/esql
+  if test -z "$PHP_INFORMIX/${ABILIB}/esql" || echo "$PHP_INFORMIX/${ABILIB}/esql" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_INFORMIX/${ABILIB}/esql
   else
     
-    ep_dir="`echo $PHP_INFORMIX/lib/esql|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_INFORMIX/${ABILIB}/esql|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_INFORMIX/lib/esql\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_INFORMIX/${ABILIB}/esql\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "INFORMIX_SHARED_LIBADD"; then
-      INFORMIX_SHARED_LIBADD="-R$PHP_INFORMIX/lib/esql -L$PHP_INFORMIX/lib/esql $INFORMIX_SHARED_LIBADD"
+      INFORMIX_SHARED_LIBADD="-L$PHP_INFORMIX/${ABILIB}/esql $INFORMIX_SHARED_LIBADD"
     else
       
   
@@ -29377,7 +29383,7 @@
       *.o)
         IFX_LIBOBJS="$IFX_LIBOBJS $i"
         
-  if test "$ext_builddir" != "/usr/lib"; then
+  if test "$ext_builddir" != "/usr/${ABILIB}"; then
     
   if test -z "$ext_builddir" || echo "$ext_builddir" | grep '^/' >/dev/null ; then
     ai_p=$ext_builddir
@@ -29390,7 +29396,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "INFORMIX_SHARED_LIBADD"; then
-      INFORMIX_SHARED_LIBADD="-R$ext_builddir -L$ext_builddir $INFORMIX_SHARED_LIBADD"
+      INFORMIX_SHARED_LIBADD="-L$ext_builddir $INFORMIX_SHARED_LIBADD"
     else
       
   
@@ -29478,7 +29484,7 @@
             ;;
           *)
             ac_dir="`echo $i|sed 's#[^/]*$##;s#\/$##'`"
-            ac_lib="`echo $i|sed 's#^/.*/lib##g;s#\.a##g'`"
+            ac_lib="`echo $i|sed 's#^/.*/${ABILIB}##g;s#\.a##g'`"
             DLIBS="$DLIBS -L$ac_dir -l$ac_lib"
             ;;
         esac
@@ -29774,10 +29780,10 @@
     { echo "configure: error: Cannot find iiapi.h under $II_DIR/files" 1>&2; exit 1; }
   fi
 
-  if test -r $II_DIR/lib/libiiapi.a; then
-    II_LIB_DIR=$II_DIR/lib
+  if test -r $II_DIR/${ABILIB}/libiiapi.a; then
+    II_LIB_DIR=$II_DIR/${ABILIB}
   else
-    { echo "configure: error: Cannot find libiiapi.a under $II_DIR/lib" 1>&2; exit 1; }
+    { echo "configure: error: Cannot find libiiapi.a under $II_DIR/${ABILIB}" 1>&2; exit 1; }
   fi
 
   
@@ -29786,7 +29792,7 @@
     II_SHARED_LIBADD="-liiapi $II_SHARED_LIBADD"
     if test -n "$II_LIB_DIR"; then
       
-  if test "$II_LIB_DIR" != "/usr/lib"; then
+  if test "$II_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$II_LIB_DIR" || echo "$II_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$II_LIB_DIR
@@ -29799,7 +29805,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "II_SHARED_LIBADD"; then
-      II_SHARED_LIBADD="-R$II_LIB_DIR -L$II_LIB_DIR $II_SHARED_LIBADD"
+      II_SHARED_LIBADD="-L$II_LIB_DIR $II_SHARED_LIBADD"
     else
       
   
@@ -29824,7 +29830,7 @@
 
   if test -n "$II_LIB_DIR"; then
     
-  if test "$II_LIB_DIR" != "/usr/lib"; then
+  if test "$II_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$II_LIB_DIR" || echo "$II_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$II_LIB_DIR
@@ -29837,7 +29843,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$II_LIB_DIR -L$II_LIB_DIR $"
+      ="-L$II_LIB_DIR $"
     else
       
   
@@ -29880,7 +29886,7 @@
     II_SHARED_LIBADD="-lingres $II_SHARED_LIBADD"
     if test -n "$II_LIB_DIR"; then
       
-  if test "$II_LIB_DIR" != "/usr/lib"; then
+  if test "$II_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$II_LIB_DIR" || echo "$II_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$II_LIB_DIR
@@ -29893,7 +29899,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "II_SHARED_LIBADD"; then
-      II_SHARED_LIBADD="-R$II_LIB_DIR -L$II_LIB_DIR $II_SHARED_LIBADD"
+      II_SHARED_LIBADD="-L$II_LIB_DIR $II_SHARED_LIBADD"
     else
       
   
@@ -29918,7 +29924,7 @@
 
   if test -n "$II_LIB_DIR"; then
     
-  if test "$II_LIB_DIR" != "/usr/lib"; then
+  if test "$II_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$II_LIB_DIR" || echo "$II_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$II_LIB_DIR
@@ -29931,7 +29937,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$II_LIB_DIR -L$II_LIB_DIR $"
+      ="-L$II_LIB_DIR $"
     else
       
   
@@ -30054,10 +30060,10 @@
 if test "$PHP_INTERBASE" != "no"; then
   if test "$PHP_INTERBASE" = "yes"; then
     IBASE_INCDIR=/usr/interbase/include
-    IBASE_LIBDIR=/usr/interbase/lib
+    IBASE_LIBDIR=/usr/interbase/${ABILIB}
   else
     IBASE_INCDIR=$PHP_INTERBASE/include
-    IBASE_LIBDIR=$PHP_INTERBASE/lib
+    IBASE_LIBDIR=$PHP_INTERBASE/${ABILIB}
   fi
   
 
@@ -30065,7 +30071,7 @@
     INTERBASE_SHARED_LIBADD="-lgds $INTERBASE_SHARED_LIBADD"
     if test -n "$IBASE_LIBDIR"; then
       
-  if test "$IBASE_LIBDIR" != "/usr/lib"; then
+  if test "$IBASE_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$IBASE_LIBDIR" || echo "$IBASE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$IBASE_LIBDIR
@@ -30078,7 +30084,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "INTERBASE_SHARED_LIBADD"; then
-      INTERBASE_SHARED_LIBADD="-R$IBASE_LIBDIR -L$IBASE_LIBDIR $INTERBASE_SHARED_LIBADD"
+      INTERBASE_SHARED_LIBADD="-L$IBASE_LIBDIR $INTERBASE_SHARED_LIBADD"
     else
       
   
@@ -30103,7 +30109,7 @@
 
   if test -n "$IBASE_LIBDIR"; then
     
-  if test "$IBASE_LIBDIR" != "/usr/lib"; then
+  if test "$IBASE_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$IBASE_LIBDIR" || echo "$IBASE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$IBASE_LIBDIR
@@ -30116,7 +30122,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$IBASE_LIBDIR -L$IBASE_LIBDIR $"
+      ="-L$IBASE_LIBDIR $"
     else
       
   
@@ -30484,7 +30490,7 @@
     -L*)
       ac_ii=`echo $ac_i|cut -c 3-`
       
-  if test "$ac_ii" != "/usr/lib"; then
+  if test "$ac_ii" != "/usr/${ABILIB}"; then
     
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
@@ -30497,7 +30503,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ac_ii -L$ac_ii $"
+      ="-L$ac_ii $"
     else
       
   
@@ -30562,22 +30568,22 @@
 
   
 
-  if test -n "$PHP_IRCG/lib"; then
+  if test -n "$PHP_IRCG/${ABILIB}"; then
     
-  if test "$PHP_IRCG/lib" != "/usr/lib"; then
+  if test "$PHP_IRCG/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_IRCG/lib" || echo "$PHP_IRCG/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_IRCG/lib
+  if test -z "$PHP_IRCG/${ABILIB}" || echo "$PHP_IRCG/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_IRCG/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_IRCG/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_IRCG/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_IRCG/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_IRCG/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_IRCG/lib -L$PHP_IRCG/lib $"
+      ="-L$PHP_IRCG/${ABILIB} $"
     else
       
   
@@ -30901,22 +30907,22 @@
       { echo "configure: error: Can not find the javac binary under $withval/bin/" 1>&2; exit 1; }
     fi
 
-    if test -d $withval/lib/kaffe; then
+    if test -d $withval/${ABILIB}/kaffe; then
       
-  if test "$withval/lib" != "/usr/lib"; then
+  if test "$withval/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$withval/lib" || echo "$withval/lib" | grep '^/' >/dev/null ; then
-    ai_p=$withval/lib
+  if test -z "$withval/${ABILIB}" || echo "$withval/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$withval/${ABILIB}
   else
     
-    ep_dir="`echo $withval/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $withval/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$withval/lib\"`"
+    ai_p="$ep_realdir/`basename \"$withval/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$withval/lib -L$withval/lib $"
+      ="-L$withval/${ABILIB} $"
     else
       
   
@@ -30940,11 +30946,11 @@
       JAVA_INCLUDE=-I$withval/include/kaffe
       JAVA_CLASSPATH=$withval/share/kaffe/Klasses.jar
       JAVA_LIB=kaffevm
-      JAVA_LIBPATH=$withval/lib/kaffe
+      JAVA_LIBPATH=$withval/${ABILIB}/kaffe
       java_libext=kaffevm
 
-      test -f $withval/lib/$JAVA_LIB && JAVA_LIBPATH=$withval/lib
-      test -f $withval/lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$withval/lib/kaffe
+      test -f $withval/${ABILIB}/$JAVA_LIB && JAVA_LIBPATH=$withval/${ABILIB}
+      test -f $withval/${ABILIB}/kaffe/$JAVA_LIB && JAVA_LIBPATH=$withval/${ABILIB}/kaffe
 
       # accomodate old versions of kaffe which don't support jar
       if kaffe -version 2>&1 | grep 1.0b > /dev/null; then
@@ -30951,14 +30957,14 @@
         JAVA_JAR='zip -q0'
       fi
 
-    elif test -f $withval/lib/$java_libext; then
+    elif test -f $withval/${ABILIB}/$java_libext; then
       JAVA_LIB=java
-      JAVA_LIBPATH=$withval/lib
+      JAVA_LIBPATH=$withval/${ABILIB}
       JAVA_INCLUDE=-I$withval/include
-      test -f $withval/lib/classes.zip && JAVA_CFLAGS=-DJNI_11
-      test -f $withval/lib/jvm.jar     && JAVA_CFLAGS=-DJNI_12
-      test -f $withval/lib/classes.zip && JAVA_CLASSPATH=$withval/lib/classes.zip
-      test -f $withval/lib/jvm.jar     && JAVA_CLASSPATH=$withval/lib/jvm.jar
+      test -f $withval/${ABILIB}/classes.zip && JAVA_CFLAGS=-DJNI_11
+      test -f $withval/${ABILIB}/jvm.jar     && JAVA_CFLAGS=-DJNI_12
+      test -f $withval/${ABILIB}/classes.zip && JAVA_CLASSPATH=$withval/${ABILIB}/classes.zip
+      test -f $withval/${ABILIB}/jvm.jar     && JAVA_CLASSPATH=$withval/${ABILIB}/jvm.jar
       for i in $JAVA_INCLUDE/*; do
         test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
       done
@@ -30980,7 +30986,7 @@
           JAVA_LIB=java
           JAVA_LIBPATH=$i
           test -d $i/hotspot && 
-  if test "$i/hotspot" != "/usr/lib"; then
+  if test "$i/hotspot" != "/usr/${ABILIB}"; then
     
   if test -z "$i/hotspot" || echo "$i/hotspot" | grep '^/' >/dev/null ; then
     ai_p=$i/hotspot
@@ -30993,7 +30999,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/hotspot -L$i/hotspot $"
+      ="-L$i/hotspot $"
     else
       
   
@@ -31013,7 +31019,7 @@
   fi
 
           test -d $i/classic && 
-  if test "$i/classic" != "/usr/lib"; then
+  if test "$i/classic" != "/usr/${ABILIB}"; then
     
   if test -z "$i/classic" || echo "$i/classic" | grep '^/' >/dev/null ; then
     ai_p=$i/classic
@@ -31026,7 +31032,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/classic -L$i/classic $"
+      ="-L$i/classic $"
     else
       
   
@@ -31046,7 +31052,7 @@
   fi
 
           test -d $i/server && 
-  if test "$i/server" != "/usr/lib"; then
+  if test "$i/server" != "/usr/${ABILIB}"; then
     
   if test -z "$i/server" || echo "$i/server" | grep '^/' >/dev/null ; then
     ai_p=$i/server
@@ -31059,7 +31065,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/server -L$i/server $"
+      ="-L$i/server $"
     else
       
   
@@ -31079,7 +31085,7 @@
   fi
 
           test -d $i/native_threads && 
-  if test "$i/native_threads" != "/usr/lib"; then
+  if test "$i/native_threads" != "/usr/${ABILIB}"; then
     
   if test -z "$i/native_threads" || echo "$i/native_threads" | grep '^/' >/dev/null ; then
     ai_p=$i/native_threads
@@ -31092,7 +31098,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/native_threads -L$i/native_threads $"
+      ="-L$i/native_threads $"
     else
       
   
@@ -31130,7 +31136,7 @@
       { echo "configure: error: unable to find Java VM libraries" 1>&2; exit 1; }
     fi
     
-  if test "$JAVA_LIBPATH" != "/usr/lib"; then
+  if test "$JAVA_LIBPATH" != "/usr/${ABILIB}"; then
     
   if test -z "$JAVA_LIBPATH" || echo "$JAVA_LIBPATH" | grep '^/' >/dev/null ; then
     ai_p=$JAVA_LIBPATH
@@ -31143,7 +31149,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$JAVA_LIBPATH -L$JAVA_LIBPATH $"
+      ="-L$JAVA_LIBPATH $"
     else
       
   
@@ -31687,15 +31693,15 @@
   if test -f $i/include/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$i/include
-    LDAP_LIBDIR=$i/lib
+    LDAP_LIBDIR=$i/${ABILIB}
   elif test -f $i/include/umich-ldap/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$i/include/umich-ldap
-    LDAP_LIBDIR=$i/lib
+    LDAP_LIBDIR=$i/${ABILIB}
   elif test -f $i/ldap/public/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$i/ldap/public
-    LDAP_LIBDIR=$i/lib
+    LDAP_LIBDIR=$i/${ABILIB}
   fi
 
     done
@@ -31704,15 +31710,15 @@
   if test -f $PHP_LDAP/include/ldap.h; then
     LDAP_DIR=$PHP_LDAP
     LDAP_INCDIR=$PHP_LDAP/include
-    LDAP_LIBDIR=$PHP_LDAP/lib
+    LDAP_LIBDIR=$PHP_LDAP/${ABILIB}
   elif test -f $PHP_LDAP/include/umich-ldap/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$PHP_LDAP/include/umich-ldap
-    LDAP_LIBDIR=$PHP_LDAP/lib
+    LDAP_LIBDIR=$PHP_LDAP/${ABILIB}
   elif test -f $PHP_LDAP/ldap/public/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$PHP_LDAP/ldap/public
-    LDAP_LIBDIR=$PHP_LDAP/lib
+    LDAP_LIBDIR=$PHP_LDAP/${ABILIB}
   fi
 
   fi
@@ -31735,7 +31741,7 @@
     LDAP_SHARED_LIBADD="-llber $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -31748,7 +31754,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -31773,7 +31779,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -31786,7 +31792,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -31829,7 +31835,7 @@
     LDAP_SHARED_LIBADD="-lldap $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -31842,7 +31848,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -31867,7 +31873,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -31880,7 +31886,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -31925,7 +31931,7 @@
     LDAP_SHARED_LIBADD="-lldap $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -31938,7 +31944,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -31963,7 +31969,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -31976,7 +31982,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32035,7 +32041,7 @@
     LDAP_SHARED_LIBADD="-lnspr3 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32048,7 +32054,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32073,7 +32079,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32086,7 +32092,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32129,7 +32135,7 @@
     LDAP_SHARED_LIBADD="-lplc3 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32142,7 +32148,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32167,7 +32173,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32180,7 +32186,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32223,7 +32229,7 @@
     LDAP_SHARED_LIBADD="-lplds3 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32236,7 +32242,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32261,7 +32267,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32274,7 +32280,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32317,7 +32323,7 @@
     LDAP_SHARED_LIBADD="-lldapssl41 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32330,7 +32336,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32355,7 +32361,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32368,7 +32374,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32431,7 +32437,7 @@
     LDAP_SHARED_LIBADD="-lldapssl30 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32444,7 +32450,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32469,7 +32475,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32482,7 +32488,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32545,7 +32551,7 @@
     LDAP_SHARED_LIBADD="-lldap30 $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32558,7 +32564,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32583,7 +32589,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32596,7 +32602,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32645,7 +32651,7 @@
     LDAP_SHARED_LIBADD="-lumich_lber $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32658,7 +32664,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32683,7 +32689,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32696,7 +32702,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32739,7 +32745,7 @@
     LDAP_SHARED_LIBADD="-lumich_ldap $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32752,7 +32758,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32777,7 +32783,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32790,7 +32796,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -32835,7 +32841,7 @@
     LDAP_SHARED_LIBADD="-lclntsh $LDAP_SHARED_LIBADD"
     if test -n "$LDAP_LIBDIR"; then
       
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32848,7 +32854,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "LDAP_SHARED_LIBADD"; then
-      LDAP_SHARED_LIBADD="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
+      LDAP_SHARED_LIBADD="-L$LDAP_LIBDIR $LDAP_SHARED_LIBADD"
     else
       
   
@@ -32873,7 +32879,7 @@
 
   if test -n "$LDAP_LIBDIR"; then
     
-  if test "$LDAP_LIBDIR" != "/usr/lib"; then
+  if test "$LDAP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$LDAP_LIBDIR
@@ -32886,7 +32892,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LDAP_LIBDIR -L$LDAP_LIBDIR $"
+      ="-L$LDAP_LIBDIR $"
     else
       
   
@@ -33443,7 +33449,7 @@
     fi
   done
 
-  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
+  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/${ABILIB} $MCAL_DIR/${ABILIB}/mcal $MCAL_DIR/${ABILIB}; do
     if test -r "$i/libmcal.a"; then
       MCAL_LIBRARY=$i
     fi
@@ -33497,7 +33503,7 @@
   fi
 
   
-  if test "$MCAL_LIBRARY" != "/usr/lib"; then
+  if test "$MCAL_LIBRARY" != "/usr/${ABILIB}"; then
     
   if test -z "$MCAL_LIBRARY" || echo "$MCAL_LIBRARY" | grep '^/' >/dev/null ; then
     ai_p=$MCAL_LIBRARY
@@ -33510,7 +33516,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "MCAL_SHARED_LIBADD"; then
-      MCAL_SHARED_LIBADD="-R$MCAL_LIBRARY -L$MCAL_LIBRARY $MCAL_SHARED_LIBADD"
+      MCAL_SHARED_LIBADD="-L$MCAL_LIBRARY $MCAL_SHARED_LIBADD"
     else
       
   
@@ -33835,7 +33841,7 @@
   
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-    -L$MCRYPT_DIR/lib -lltdl
+    -L$MCRYPT_DIR/${ABILIB} -lltdl
    $LDFLAGS"
   echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
 echo "configure:33842: checking for mcrypt_module_open in -lmcrypt" >&5
@@ -33910,7 +33916,7 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$MCRYPT_DIR/lib
+      -L$MCRYPT_DIR/${ABILIB}
      $LDFLAGS"
   echo $ac_n "checking for mcrypt_generic_deinit in -lmcrypt""... $ac_c" 1>&6
 echo "configure:33917: checking for mcrypt_generic_deinit in -lmcrypt" >&5
@@ -33975,7 +33981,7 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$MCRYPT_DIR/lib
+      -L$MCRYPT_DIR/${ABILIB}
      $LDFLAGS"
   echo $ac_n "checking for init_mcrypt in -lmcrypt""... $ac_c" 1>&6
 echo "configure:33982: checking for init_mcrypt in -lmcrypt" >&5
@@ -34041,22 +34047,22 @@
 
   if test "$ext_shared" = "yes"; then
     MCRYPT_SHARED_LIBADD="-lmcrypt $MCRYPT_SHARED_LIBADD"
-    if test -n "$MCRYPT_DIR/lib"; then
+    if test -n "$MCRYPT_DIR/${ABILIB}"; then
       
-  if test "$MCRYPT_DIR/lib" != "/usr/lib"; then
+  if test "$MCRYPT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MCRYPT_DIR/lib" || echo "$MCRYPT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MCRYPT_DIR/lib
+  if test -z "$MCRYPT_DIR/${ABILIB}" || echo "$MCRYPT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MCRYPT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MCRYPT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MCRYPT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "MCRYPT_SHARED_LIBADD"; then
-      MCRYPT_SHARED_LIBADD="-R$MCRYPT_DIR/lib -L$MCRYPT_DIR/lib $MCRYPT_SHARED_LIBADD"
+      MCRYPT_SHARED_LIBADD="-L$MCRYPT_DIR/${ABILIB} $MCRYPT_SHARED_LIBADD"
     else
       
   
@@ -34079,22 +34085,22 @@
   else
     
 
-  if test -n "$MCRYPT_DIR/lib"; then
+  if test -n "$MCRYPT_DIR/${ABILIB}"; then
     
-  if test "$MCRYPT_DIR/lib" != "/usr/lib"; then
+  if test "$MCRYPT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MCRYPT_DIR/lib" || echo "$MCRYPT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MCRYPT_DIR/lib
+  if test -z "$MCRYPT_DIR/${ABILIB}" || echo "$MCRYPT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MCRYPT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MCRYPT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MCRYPT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MCRYPT_DIR/lib -L$MCRYPT_DIR/lib $"
+      ="-L$MCRYPT_DIR/${ABILIB} $"
     else
       
   
@@ -34477,22 +34483,22 @@
 
   if test "$ext_shared" = "yes"; then
     MCVE_SHARED_LIBADD="-lmcve $MCVE_SHARED_LIBADD"
-    if test -n "$MCVE_DIR/lib"; then
+    if test -n "$MCVE_DIR/${ABILIB}"; then
       
-  if test "$MCVE_DIR/lib" != "/usr/lib"; then
+  if test "$MCVE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MCVE_DIR/lib" || echo "$MCVE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MCVE_DIR/lib
+  if test -z "$MCVE_DIR/${ABILIB}" || echo "$MCVE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MCVE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MCVE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MCVE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MCVE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MCVE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "MCVE_SHARED_LIBADD"; then
-      MCVE_SHARED_LIBADD="-R$MCVE_DIR/lib -L$MCVE_DIR/lib $MCVE_SHARED_LIBADD"
+      MCVE_SHARED_LIBADD="-L$MCVE_DIR/${ABILIB} $MCVE_SHARED_LIBADD"
     else
       
   
@@ -34515,22 +34521,22 @@
   else
     
 
-  if test -n "$MCVE_DIR/lib"; then
+  if test -n "$MCVE_DIR/${ABILIB}"; then
     
-  if test "$MCVE_DIR/lib" != "/usr/lib"; then
+  if test "$MCVE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MCVE_DIR/lib" || echo "$MCVE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MCVE_DIR/lib
+  if test -z "$MCVE_DIR/${ABILIB}" || echo "$MCVE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MCVE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MCVE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MCVE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MCVE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MCVE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MCVE_DIR/lib -L$MCVE_DIR/lib $"
+      ="-L$MCVE_DIR/${ABILIB} $"
     else
       
   
@@ -34872,22 +34878,22 @@
 
   if test "$ext_shared" = "yes"; then
     MHASH_SHARED_LIBADD="-lmhash $MHASH_SHARED_LIBADD"
-    if test -n "$MHASH_DIR/lib"; then
+    if test -n "$MHASH_DIR/${ABILIB}"; then
       
-  if test "$MHASH_DIR/lib" != "/usr/lib"; then
+  if test "$MHASH_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MHASH_DIR/lib" || echo "$MHASH_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MHASH_DIR/lib
+  if test -z "$MHASH_DIR/${ABILIB}" || echo "$MHASH_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MHASH_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MHASH_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MHASH_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MHASH_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MHASH_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "MHASH_SHARED_LIBADD"; then
-      MHASH_SHARED_LIBADD="-R$MHASH_DIR/lib -L$MHASH_DIR/lib $MHASH_SHARED_LIBADD"
+      MHASH_SHARED_LIBADD="-L$MHASH_DIR/${ABILIB} $MHASH_SHARED_LIBADD"
     else
       
   
@@ -34910,22 +34916,22 @@
   else
     
 
-  if test -n "$MHASH_DIR/lib"; then
+  if test -n "$MHASH_DIR/${ABILIB}"; then
     
-  if test "$MHASH_DIR/lib" != "/usr/lib"; then
+  if test "$MHASH_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MHASH_DIR/lib" || echo "$MHASH_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MHASH_DIR/lib
+  if test -z "$MHASH_DIR/${ABILIB}" || echo "$MHASH_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MHASH_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MHASH_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MHASH_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MHASH_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MHASH_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MHASH_DIR/lib -L$MHASH_DIR/lib $"
+      ="-L$MHASH_DIR/${ABILIB} $"
     else
       
   
@@ -35230,7 +35236,7 @@
 
 if test "$PHP_MING" != "no"; then
   for i in $PHP_MING /usr/local /usr; do
-    if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
+    if test -f $i/${ABILIB}/libming.$SHLIB_SUFFIX_NAME -o -f $i/${ABILIB}/libming.a; then
       MING_DIR=$i
     fi
   done
@@ -35242,7 +35248,7 @@
   
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-    -L$MING_DIR/lib
+    -L$MING_DIR/${ABILIB}
    $LDFLAGS"
   echo $ac_n "checking for Ming_useSWFVersion in -lming""... $ac_c" 1>&6
 echo "configure:35249: checking for Ming_useSWFVersion in -lming" >&5
@@ -35334,22 +35340,22 @@
 
   if test "$ext_shared" = "yes"; then
     MING_SHARED_LIBADD="-lming $MING_SHARED_LIBADD"
-    if test -n "$MING_DIR/lib"; then
+    if test -n "$MING_DIR/${ABILIB}"; then
       
-  if test "$MING_DIR/lib" != "/usr/lib"; then
+  if test "$MING_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MING_DIR/lib" || echo "$MING_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MING_DIR/lib
+  if test -z "$MING_DIR/${ABILIB}" || echo "$MING_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MING_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MING_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MING_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MING_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MING_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "MING_SHARED_LIBADD"; then
-      MING_SHARED_LIBADD="-R$MING_DIR/lib -L$MING_DIR/lib $MING_SHARED_LIBADD"
+      MING_SHARED_LIBADD="-L$MING_DIR/${ABILIB} $MING_SHARED_LIBADD"
     else
       
   
@@ -35372,22 +35378,22 @@
   else
     
 
-  if test -n "$MING_DIR/lib"; then
+  if test -n "$MING_DIR/${ABILIB}"; then
     
-  if test "$MING_DIR/lib" != "/usr/lib"; then
+  if test "$MING_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MING_DIR/lib" || echo "$MING_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MING_DIR/lib
+  if test -z "$MING_DIR/${ABILIB}" || echo "$MING_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MING_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MING_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MING_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MING_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MING_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MING_DIR/lib -L$MING_DIR/lib $"
+      ="-L$MING_DIR/${ABILIB} $"
     else
       
   
@@ -35690,11 +35696,11 @@
     if test "$PHP_MNOGOSEARCH" = "yes"; then
       MNOGOSEARCH_BINDIR=/usr/local/mnogosearch/bin
       MNOGOSEARCH_INCDIR=/usr/local/mnogosearch/include
-      MNOGOSEARCH_LIBDIR=/usr/local/mnogosearch/lib
+      MNOGOSEARCH_LIBDIR=/usr/local/mnogosearch/${ABILIB}
     else
       MNOGOSEARCH_BINDIR=$PHP_MNOGOSEARCH/bin
       MNOGOSEARCH_INCDIR=$PHP_MNOGOSEARCH/include
-      MNOGOSEARCH_LIBDIR=$PHP_MNOGOSEARCH/lib
+      MNOGOSEARCH_LIBDIR=$PHP_MNOGOSEARCH/${ABILIB}
     fi
     
     echo $ac_n "checking for mnoGoSearch version""... $ac_c" 1>&6
@@ -35752,7 +35758,7 @@
     -L*)
       ac_ii=`echo $ac_i|cut -c 3-`
       
-  if test "$ac_ii" != "/usr/lib"; then
+  if test "$ac_ii" != "/usr/${ABILIB}"; then
     
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
@@ -35765,7 +35771,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "MNOGOSEARCH_SHARED_LIBADD"; then
-      MNOGOSEARCH_SHARED_LIBADD="-R$ac_ii -L$ac_ii $MNOGOSEARCH_SHARED_LIBADD"
+      MNOGOSEARCH_SHARED_LIBADD="-L$ac_ii $MNOGOSEARCH_SHARED_LIBADD"
     else
       
   
@@ -36091,13 +36097,13 @@
 
  
 if test "$PHP_MSESSION" != "no"; then
-	if test -r $PHP_MSESSION/lib/libphoenix.a; then
+	if test -r $PHP_MSESSION/${ABILIB}/libphoenix.a; then
 		PHOENIX_DIR=$PHP_MSESSION
 	else
 		echo $ac_n "checking for msession in default path""... $ac_c" 1>&6
 echo "configure:36099: checking for msession in default path" >&5
 		for i in /usr/local/phoenix /usr/local /usr; do
-			if test -r $i/lib/libphoenix.a; then
+			if test -r $i/${ABILIB}/libphoenix.a; then
 				PHOENIX_DIR=$i
 				echo "$ac_t""found in $i" 1>&6
 			fi
@@ -36118,22 +36124,22 @@
 
   if test "$ext_shared" = "yes"; then
     PHOENIX_LIB="-lphoenix $PHOENIX_LIB"
-    if test -n ""$PHOENIX_DIR/lib""; then
+    if test -n ""$PHOENIX_DIR/${ABILIB}""; then
       
-  if test ""$PHOENIX_DIR/lib"" != "/usr/lib"; then
+  if test ""$PHOENIX_DIR/${ABILIB}"" != "/usr/${ABILIB}"; then
     
-  if test -z ""$PHOENIX_DIR/lib"" || echo ""$PHOENIX_DIR/lib"" | grep '^/' >/dev/null ; then
-    ai_p="$PHOENIX_DIR/lib"
+  if test -z ""$PHOENIX_DIR/${ABILIB}"" || echo ""$PHOENIX_DIR/${ABILIB}"" | grep '^/' >/dev/null ; then
+    ai_p="$PHOENIX_DIR/${ABILIB}"
   else
     
-    ep_dir="`echo "$PHOENIX_DIR/lib"|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo "$PHOENIX_DIR/${ABILIB}"|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \""$PHOENIX_DIR/lib"\"`"
+    ai_p="$ep_realdir/`basename \""$PHOENIX_DIR/${ABILIB}"\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "PHOENIX_LIB"; then
-      PHOENIX_LIB="-R"$PHOENIX_DIR/lib" -L"$PHOENIX_DIR/lib" $PHOENIX_LIB"
+      PHOENIX_LIB="-R"$PHOENIX_DIR/${ABILIB}" -L"$PHOENIX_DIR/${ABILIB}" $PHOENIX_LIB"
     else
       
   
@@ -36156,22 +36162,22 @@
   else
     
 
-  if test -n ""$PHOENIX_DIR/lib""; then
+  if test -n ""$PHOENIX_DIR/${ABILIB}""; then
     
-  if test ""$PHOENIX_DIR/lib"" != "/usr/lib"; then
+  if test ""$PHOENIX_DIR/${ABILIB}"" != "/usr/${ABILIB}"; then
     
-  if test -z ""$PHOENIX_DIR/lib"" || echo ""$PHOENIX_DIR/lib"" | grep '^/' >/dev/null ; then
-    ai_p="$PHOENIX_DIR/lib"
+  if test -z ""$PHOENIX_DIR/${ABILIB}"" || echo ""$PHOENIX_DIR/${ABILIB}"" | grep '^/' >/dev/null ; then
+    ai_p="$PHOENIX_DIR/${ABILIB}"
   else
     
-    ep_dir="`echo "$PHOENIX_DIR/lib"|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo "$PHOENIX_DIR/${ABILIB}"|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \""$PHOENIX_DIR/lib"\"`"
+    ai_p="$ep_realdir/`basename \""$PHOENIX_DIR/${ABILIB}"\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R"$PHOENIX_DIR/lib" -L"$PHOENIX_DIR/lib" $"
+      ="-R"$PHOENIX_DIR/${ABILIB}" -L"$PHOENIX_DIR/${ABILIB}" $"
     else
       
   
@@ -36476,10 +36482,10 @@
   if test "$PHP_MSQL" != "no"; then
     if test "$PHP_MSQL" = "yes"; then
       MSQL_INCDIR=/usr/local/Hughes/include
-      MSQL_LIBDIR=/usr/local/Hughes/lib
+      MSQL_LIBDIR=/usr/local/Hughes/${ABILIB}
     else
       MSQL_INCDIR=$PHP_MSQL/include
-      MSQL_LIBDIR=$PHP_MSQL/lib
+      MSQL_LIBDIR=$PHP_MSQL/${ABILIB}
     fi
     
 
@@ -36487,7 +36493,7 @@
     MSQL_SHARED_LIBADD="-lmsql $MSQL_SHARED_LIBADD"
     if test -n "$MSQL_LIBDIR"; then
       
-  if test "$MSQL_LIBDIR" != "/usr/lib"; then
+  if test "$MSQL_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$MSQL_LIBDIR" || echo "$MSQL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$MSQL_LIBDIR
@@ -36500,7 +36506,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "MSQL_SHARED_LIBADD"; then
-      MSQL_SHARED_LIBADD="-R$MSQL_LIBDIR -L$MSQL_LIBDIR $MSQL_SHARED_LIBADD"
+      MSQL_SHARED_LIBADD="-L$MSQL_LIBDIR $MSQL_SHARED_LIBADD"
     else
       
   
@@ -36525,7 +36531,7 @@
 
   if test -n "$MSQL_LIBDIR"; then
     
-  if test "$MSQL_LIBDIR" != "/usr/lib"; then
+  if test "$MSQL_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$MSQL_LIBDIR" || echo "$MSQL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$MSQL_LIBDIR
@@ -36538,7 +36544,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MSQL_LIBDIR -L$MSQL_LIBDIR $"
+      ="-L$MSQL_LIBDIR $"
     else
       
   
@@ -37123,8 +37129,8 @@
     if test -f $i/libs/libhdmuscat3.6.a; then
       MUSCAT_LIBDIR=$i/libs
       MUSCAT_DIR=$i
-    elif test -f $i/lib/libhdmuscat3.6.a; then
-      MUSCAT_LIBDIR=$i/lib
+    elif test -f $i/${ABILIB}/libhdmuscat3.6.a; then
+      MUSCAT_LIBDIR=$i/${ABILIB}
       MUSCAT_DIR=$i
     fi
   done
@@ -37154,7 +37160,7 @@
     MUSCAT_SHARED_LIBADD="-lhdmuscat3.6 $MUSCAT_SHARED_LIBADD"
     if test -n "$MUSCAT_LIBDIR"; then
       
-  if test "$MUSCAT_LIBDIR" != "/usr/lib"; then
+  if test "$MUSCAT_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$MUSCAT_LIBDIR" || echo "$MUSCAT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$MUSCAT_LIBDIR
@@ -37167,7 +37173,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "MUSCAT_SHARED_LIBADD"; then
-      MUSCAT_SHARED_LIBADD="-R$MUSCAT_LIBDIR -L$MUSCAT_LIBDIR $MUSCAT_SHARED_LIBADD"
+      MUSCAT_SHARED_LIBADD="-L$MUSCAT_LIBDIR $MUSCAT_SHARED_LIBADD"
     else
       
   
@@ -37192,7 +37198,7 @@
 
   if test -n "$MUSCAT_LIBDIR"; then
     
-  if test "$MUSCAT_LIBDIR" != "/usr/lib"; then
+  if test "$MUSCAT_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$MUSCAT_LIBDIR" || echo "$MUSCAT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$MUSCAT_LIBDIR
@@ -37205,7 +37211,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MUSCAT_LIBDIR -L$MUSCAT_LIBDIR $"
+      ="-L$MUSCAT_LIBDIR $"
     else
       
   
@@ -37596,7 +37602,7 @@
       /var/run/mysqld/mysqld.sock \
       /var/tmp/mysql.sock \
       /var/run/mysql/mysql.sock \
-      /var/lib/mysql/mysql.sock \
+      /var/${ABILIB}/mysql/mysql.sock \
       /var/mysql/mysql.sock \
       /Private/tmp/mysql.sock \
       ; do
@@ -39686,7 +39692,7 @@
 
   MYSQL_MODULE_TYPE=external
 
-  for i in lib lib/mysql; do
+  for i in ${ABILIB} ${ABILIB}/mysql; do
     
   str="$MYSQL_DIR/$i/libmysqlclient.*"
   for j in `echo $str`; do
@@ -39758,7 +39764,7 @@
     MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD"
     if test -n "$PHP_ZLIB_DIR"; then
       
-  if test "$PHP_ZLIB_DIR" != "/usr/lib"; then
+  if test "$PHP_ZLIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR
@@ -39771,7 +39777,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "MYSQL_SHARED_LIBADD"; then
-      MYSQL_SHARED_LIBADD="-R$PHP_ZLIB_DIR -L$PHP_ZLIB_DIR $MYSQL_SHARED_LIBADD"
+      MYSQL_SHARED_LIBADD="-L$PHP_ZLIB_DIR $MYSQL_SHARED_LIBADD"
     else
       
   
@@ -39796,7 +39802,7 @@
 
   if test -n "$PHP_ZLIB_DIR"; then
     
-  if test "$PHP_ZLIB_DIR" != "/usr/lib"; then
+  if test "$PHP_ZLIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PHP_ZLIB_DIR
@@ -39809,7 +39815,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_ZLIB_DIR -L$PHP_ZLIB_DIR $"
+      ="-L$PHP_ZLIB_DIR $"
     else
       
   
@@ -39849,7 +39855,7 @@
       
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-        -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR 
+        -L$PHP_ZLIB_DIR/${ABILIB} -L$MYSQL_LIB_DIR 
        $LDFLAGS"
   echo $ac_n "checking for mysql_error in -lmysqlclient""... $ac_c" 1>&6
 echo "configure:39856: checking for mysql_error in -lmysqlclient" >&5
@@ -39900,7 +39906,7 @@
   
 fi
   
-      MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz"
+      MYSQL_LIBS="-L$PHP_ZLIB_DIR/${ABILIB} -lz"
     else
       
  case z in
@@ -39996,7 +40002,7 @@
     MYSQL_SHARED_LIBADD="-lmysqlclient $MYSQL_SHARED_LIBADD"
     if test -n "$MYSQL_LIB_DIR"; then
       
-  if test "$MYSQL_LIB_DIR" != "/usr/lib"; then
+  if test "$MYSQL_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$MYSQL_LIB_DIR
@@ -40009,7 +40015,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "MYSQL_SHARED_LIBADD"; then
-      MYSQL_SHARED_LIBADD="-R$MYSQL_LIB_DIR -L$MYSQL_LIB_DIR $MYSQL_SHARED_LIBADD"
+      MYSQL_SHARED_LIBADD="-L$MYSQL_LIB_DIR $MYSQL_SHARED_LIBADD"
     else
       
   
@@ -40034,7 +40040,7 @@
 
   if test -n "$MYSQL_LIB_DIR"; then
     
-  if test "$MYSQL_LIB_DIR" != "/usr/lib"; then
+  if test "$MYSQL_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$MYSQL_LIB_DIR
@@ -40047,7 +40053,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MYSQL_LIB_DIR -L$MYSQL_LIB_DIR $"
+      ="-L$MYSQL_LIB_DIR $"
     else
       
   
@@ -40126,7 +40132,7 @@
       /var/run/mysqld/mysqld.sock \
       /var/tmp/mysql.sock \
       /var/run/mysql/mysql.sock \
-      /var/lib/mysql/mysql.sock \
+      /var/${ABILIB}/mysql/mysql.sock \
       /var/mysql/mysql.sock \
       /Private/tmp/mysql.sock \
       ; do
@@ -40281,7 +40287,7 @@
    
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-     -L$NCURSES_DIR/lib -lm
+     -L$NCURSES_DIR/${ABILIB} -lm
     $LDFLAGS"
   echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
 echo "configure:40288: checking for $LIBSYMBOL in -l$LIBNAME" >&5
@@ -40329,22 +40335,22 @@
 
   if test "$ext_shared" = "yes"; then
     NCURSES_SHARED_LIBADD="-l$LIBNAME $NCURSES_SHARED_LIBADD"
-    if test -n "$NCURSES_DIR/lib"; then
+    if test -n "$NCURSES_DIR/${ABILIB}"; then
       
-  if test "$NCURSES_DIR/lib" != "/usr/lib"; then
+  if test "$NCURSES_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$NCURSES_DIR/lib" || echo "$NCURSES_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$NCURSES_DIR/lib
+  if test -z "$NCURSES_DIR/${ABILIB}" || echo "$NCURSES_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$NCURSES_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $NCURSES_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $NCURSES_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$NCURSES_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$NCURSES_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "NCURSES_SHARED_LIBADD"; then
-      NCURSES_SHARED_LIBADD="-R$NCURSES_DIR/lib -L$NCURSES_DIR/lib $NCURSES_SHARED_LIBADD"
+      NCURSES_SHARED_LIBADD="-L$NCURSES_DIR/${ABILIB} $NCURSES_SHARED_LIBADD"
     else
       
   
@@ -40367,22 +40373,22 @@
   else
     
 
-  if test -n "$NCURSES_DIR/lib"; then
+  if test -n "$NCURSES_DIR/${ABILIB}"; then
     
-  if test "$NCURSES_DIR/lib" != "/usr/lib"; then
+  if test "$NCURSES_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$NCURSES_DIR/lib" || echo "$NCURSES_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$NCURSES_DIR/lib
+  if test -z "$NCURSES_DIR/${ABILIB}" || echo "$NCURSES_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$NCURSES_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $NCURSES_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $NCURSES_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$NCURSES_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$NCURSES_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$NCURSES_DIR/lib -L$NCURSES_DIR/lib $"
+      ="-L$NCURSES_DIR/${ABILIB} $"
     else
       
   
@@ -41011,9 +41017,9 @@
 
   fi
 
-  if test -f "$OCI8_DIR/lib/sysliblist"; then
+  if test -f "$OCI8_DIR/${ABILIB}/sysliblist"; then
   	
-  for ac_i in `cat $OCI8_DIR/lib/sysliblist`; do
+  for ac_i in `cat $OCI8_DIR/${ABILIB}/sysliblist`; do
     case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
@@ -41048,7 +41054,7 @@
     -L*)
       ac_ii=`echo $ac_i|cut -c 3-`
       
-  if test "$ac_ii" != "/usr/lib"; then
+  if test "$ac_ii" != "/usr/${ABILIB}"; then
     
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
@@ -41061,7 +41067,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "OCI8_SYSLIB"; then
-      OCI8_SYSLIB="-R$ac_ii -L$ac_ii $OCI8_SYSLIB"
+      OCI8_SYSLIB="-L$ac_ii $OCI8_SYSLIB"
     else
       
   
@@ -41084,9 +41090,9 @@
     esac
   done
 
-  elif test -f "$OCI8_DIR/rdbms/lib/sysliblist"; then
+  elif test -f "$OCI8_DIR/rdbms/${ABILIB}/sysliblist"; then
   	
-  for ac_i in `cat $OCI8_DIR/rdbms/lib/sysliblist`; do
+  for ac_i in `cat $OCI8_DIR/rdbms/${ABILIB}/sysliblist`; do
     case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
@@ -41121,7 +41127,7 @@
     -L*)
       ac_ii=`echo $ac_i|cut -c 3-`
       
-  if test "$ac_ii" != "/usr/lib"; then
+  if test "$ac_ii" != "/usr/${ABILIB}"; then
     
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
@@ -41134,7 +41140,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "OCI8_SYSLIB"; then
-      OCI8_SYSLIB="-R$ac_ii -L$ac_ii $OCI8_SYSLIB"
+      OCI8_SYSLIB="-L$ac_ii $OCI8_SYSLIB"
     else
       
   
@@ -41165,14 +41171,14 @@
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
 	OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
 	test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
-  elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
+  elif test -f $OCI8_DIR/${ABILIB}/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
 	OCI8_VERSION=9.0
-  elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
+  elif test -f $OCI8_DIR/${ABILIB}/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
 	OCI8_VERSION=8.1
-  elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
+  elif test -f $OCI8_DIR/${ABILIB}/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
 	OCI8_VERSION=8.0
-  elif test -f $OCI8_DIR/lib/libclntsh.a; then 
-    if test -f $OCI8_DIR/lib/libcore4.a; then 
+  elif test -f $OCI8_DIR/${ABILIB}/libclntsh.a; then 
+    if test -f $OCI8_DIR/${ABILIB}/libcore4.a; then 
       OCI8_VERSION=8.0
     else
       OCI8_VERSION=8.1
@@ -41190,7 +41196,7 @@
     OCI8_SHARED_LIBADD="-lnlsrtl3 $OCI8_SHARED_LIBADD"
     if test -n """"; then
       
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -41228,7 +41234,7 @@
 
   if test -n """"; then
     
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -41284,7 +41290,7 @@
     OCI8_SHARED_LIBADD="-lcore4 $OCI8_SHARED_LIBADD"
     if test -n """"; then
       
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -41322,7 +41328,7 @@
 
   if test -n """"; then
     
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -41378,7 +41384,7 @@
     OCI8_SHARED_LIBADD="-lpsa $OCI8_SHARED_LIBADD"
     if test -n """"; then
       
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -41416,7 +41422,7 @@
 
   if test -n """"; then
     
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -41470,22 +41476,22 @@
 
   if test "$ext_shared" = "yes"; then
     OCI8_SHARED_LIBADD="-lclntsh $OCI8_SHARED_LIBADD"
-    if test -n "$OCI8_DIR/lib"; then
+    if test -n "$OCI8_DIR/${ABILIB}"; then
       
-  if test "$OCI8_DIR/lib" != "/usr/lib"; then
+  if test "$OCI8_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$OCI8_DIR/lib" || echo "$OCI8_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$OCI8_DIR/lib
+  if test -z "$OCI8_DIR/${ABILIB}" || echo "$OCI8_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$OCI8_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $OCI8_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $OCI8_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCI8_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$OCI8_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "OCI8_SHARED_LIBADD"; then
-      OCI8_SHARED_LIBADD="-R$OCI8_DIR/lib -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD"
+      OCI8_SHARED_LIBADD="-L$OCI8_DIR/${ABILIB} $OCI8_SHARED_LIBADD"
     else
       
   
@@ -41508,22 +41514,22 @@
   else
     
 
-  if test -n "$OCI8_DIR/lib"; then
+  if test -n "$OCI8_DIR/${ABILIB}"; then
     
-  if test "$OCI8_DIR/lib" != "/usr/lib"; then
+  if test "$OCI8_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$OCI8_DIR/lib" || echo "$OCI8_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$OCI8_DIR/lib
+  if test -z "$OCI8_DIR/${ABILIB}" || echo "$OCI8_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$OCI8_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $OCI8_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $OCI8_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCI8_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$OCI8_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$OCI8_DIR/lib -L$OCI8_DIR/lib $"
+      ="-L$OCI8_DIR/${ABILIB} $"
     else
       
   
@@ -41591,20 +41597,20 @@
   esac
 
   	  
-  if test "$OCI8_DIR/lib" != "/usr/lib"; then
+  if test "$OCI8_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$OCI8_DIR/lib" || echo "$OCI8_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$OCI8_DIR/lib
+  if test -z "$OCI8_DIR/${ABILIB}" || echo "$OCI8_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$OCI8_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $OCI8_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $OCI8_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCI8_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$OCI8_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "OCI8_SHARED_LIBADD"; then
-      OCI8_SHARED_LIBADD="-R$OCI8_DIR/lib -L$OCI8_DIR/lib $OCI8_SHARED_LIBADD"
+      OCI8_SHARED_LIBADD="-L$OCI8_DIR/${ABILIB} $OCI8_SHARED_LIBADD"
     else
       
   
@@ -41935,20 +41941,20 @@
   fi
 
     
-  if test "$withval/lib" != "/usr/lib"; then
+  if test "$withval/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$withval/lib" || echo "$withval/lib" | grep '^/' >/dev/null ; then
-    ai_p=$withval/lib
+  if test -z "$withval/${ABILIB}" || echo "$withval/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$withval/${ABILIB}
   else
     
-    ep_dir="`echo $withval/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $withval/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$withval/lib\"`"
+    ai_p="$ep_realdir/`basename \"$withval/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$withval/lib -L$withval/lib $"
+      ="-L$withval/${ABILIB} $"
     else
       
   
@@ -41967,7 +41973,7 @@
     fi
   fi
 
-    ODBC_OBJS="$withval/lib/odbclib.a"
+    ODBC_OBJS="$withval/${ABILIB}/odbclib.a"
     ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
     $srcdir/build/shtool mkdir -f -p ext/odbc
     rm -f "$ODBC_LIB"
@@ -42000,7 +42006,7 @@
 
   if test -n "$abs_builddir/ext/odbc"; then
     
-  if test "$abs_builddir/ext/odbc" != "/usr/lib"; then
+  if test "$abs_builddir/ext/odbc" != "/usr/${ABILIB}"; then
     
   if test -z "$abs_builddir/ext/odbc" || echo "$abs_builddir/ext/odbc" | grep '^/' >/dev/null ; then
     ai_p=$abs_builddir/ext/odbc
@@ -42013,7 +42019,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$abs_builddir/ext/odbc -L$abs_builddir/ext/odbc $"
+      ="-L$abs_builddir/ext/odbc $"
     else
       
   
@@ -42126,20 +42132,20 @@
   fi
 
 	
-  if test "$withval/lib" != "/usr/lib"; then
+  if test "$withval/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$withval/lib" || echo "$withval/lib" | grep '^/' >/dev/null ; then
-    ai_p=$withval/lib
+  if test -z "$withval/${ABILIB}" || echo "$withval/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$withval/${ABILIB}
   else
     
-    ep_dir="`echo $withval/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $withval/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$withval/lib\"`"
+    ai_p="$ep_realdir/`basename \"$withval/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$withval/lib -L$withval/lib $"
+      ="-L$withval/${ABILIB} $"
     else
       
   
@@ -42231,7 +42237,7 @@
   fi
   if test "$withval" != "no"; then
     ODBC_INCDIR=$withval/include
-    ODBC_LIBDIR=$withval/lib
+    ODBC_LIBDIR=$withval/${ABILIB}
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_TYPE=solid
     if test -f $ODBC_LIBDIR/soc*35.a; then
@@ -42363,10 +42369,10 @@
   if test "$withval" != "no"; then
     if test "$withval" = "yes"; then
         ODBC_INCDIR=/home/db2inst1/sqllib/include
-        ODBC_LIBDIR=/home/db2inst1/sqllib/lib
+        ODBC_LIBDIR=/home/db2inst1/sqllib/${ABILIB}
     else
         ODBC_INCDIR=$withval/include
-        ODBC_LIBDIR=$withval/lib
+        ODBC_LIBDIR=$withval/${ABILIB}
     fi
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
@@ -42495,9 +42501,9 @@
     for I in $LIST
     do
         case $I in
-          $EMPRESSPATH/odbccl/lib/* | \
-          $EMPRESSPATH/rdbms/lib/* | \
-          $EMPRESSPATH/common/lib/*)
+          $EMPRESSPATH/odbccl/${ABILIB}/* | \
+          $EMPRESSPATH/rdbms/${ABILIB}/* | \
+          $EMPRESSPATH/common/${ABILIB}/*)
                 NEWLIST="$NEWLIST $I"
                 ;;
         esac
@@ -42559,10 +42565,10 @@
   if test "$withval" != "no"; then
     if test "$withval" = "yes"; then
         ODBC_INCDIR=/usr/local/birdstep/include
-        ODBC_LIBDIR=/usr/local/birdstep/lib
+        ODBC_LIBDIR=/usr/local/birdstep/${ABILIB}
     else
         ODBC_INCDIR=$withval/include
-        ODBC_LIBDIR=$withval/lib
+        ODBC_LIBDIR=$withval/${ABILIB}
     fi
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_TYPE=birdstep
@@ -42598,7 +42604,7 @@
   fi
   if test "$withval" != "no"; then
     ODBC_INCDIR=$withval/include
-    ODBC_LIBDIR=$withval/lib
+    ODBC_LIBDIR=$withval/${ABILIB}
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
@@ -42651,22 +42657,22 @@
   if test "$withval" != "no"; then
     
 
-  if test -n "$withval/lib"; then
+  if test -n "$withval/${ABILIB}"; then
     
-  if test "$withval/lib" != "/usr/lib"; then
+  if test "$withval/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$withval/lib" || echo "$withval/lib" | grep '^/' >/dev/null ; then
-    ai_p=$withval/lib
+  if test -z "$withval/${ABILIB}" || echo "$withval/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$withval/${ABILIB}
   else
     
-    ep_dir="`echo $withval/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $withval/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$withval/lib\"`"
+    ai_p="$ep_realdir/`basename \"$withval/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$withval/lib -L$withval/lib $"
+      ="-L$withval/${ABILIB} $"
     else
       
   
@@ -42733,7 +42739,7 @@
 
     ODBC_TYPE=iodbc
     ODBC_INCLUDE=-I$withval/include
-    ODBC_LFLAGS=-L$withval/lib
+    ODBC_LFLAGS=-L$withval/${ABILIB}
     ODBC_LIBS=-liodbc
     cat >> confdefs.h <<\EOF
 #define HAVE_IODBC 1
@@ -42782,7 +42788,7 @@
   fi
   if test "$withval" != "no"; then
     ODBC_INCDIR=$withval/include
-    ODBC_LIBDIR=$withval/lib
+    ODBC_LIBDIR=$withval/${ABILIB}
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-lesoobclient
@@ -42834,7 +42840,7 @@
   fi
   if test "$withval" != "no"; then
     ODBC_INCDIR=$withval/include
-    ODBC_LIBDIR=$withval/lib
+    ODBC_LIBDIR=$withval/${ABILIB}
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS=-lodbc
@@ -42887,22 +42893,22 @@
   if test "$withval" != "no"; then
 	
 
-  if test -n "$withval/lib"; then
+  if test -n "$withval/${ABILIB}"; then
     
-  if test "$withval/lib" != "/usr/lib"; then
+  if test "$withval/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$withval/lib" || echo "$withval/lib" | grep '^/' >/dev/null ; then
-    ai_p=$withval/lib
+  if test -z "$withval/${ABILIB}" || echo "$withval/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$withval/${ABILIB}
   else
     
-    ep_dir="`echo $withval/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $withval/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$withval/lib\"`"
+    ai_p="$ep_realdir/`basename \"$withval/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$withval/lib -L$withval/lib $"
+      ="-L$withval/${ABILIB} $"
     else
       
   
@@ -42969,7 +42975,7 @@
 
     ODBC_TYPE=iodbc
     ODBC_INCLUDE=-I$withval/include
-    ODBC_LFLAGS=-L$withval/lib
+    ODBC_LFLAGS=-L$withval/${ABILIB}
     ODBC_LIBS=-liodbc
     cat >> confdefs.h <<\EOF
 #define HAVE_IODBC 1
@@ -43044,7 +43050,7 @@
 
   if test "$withval" != "no"; then
     ODBC_INCDIR=$withval/include
-    ODBC_LIBDIR=$withval/lib
+    ODBC_LIBDIR=$withval/${ABILIB}
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_INCLUDE=-I$ODBC_INCDIR
@@ -43066,7 +43072,7 @@
 
   if test -n "$ODBC_LIBDIR"; then
     
-  if test "$ODBC_LIBDIR" != "/usr/lib"; then
+  if test "$ODBC_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$ODBC_LIBDIR" || echo "$ODBC_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ODBC_LIBDIR
@@ -43079,7 +43085,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ODBC_LIBDIR -L$ODBC_LIBDIR $"
+      ="-L$ODBC_LIBDIR $"
     else
       
   
@@ -43408,6 +43414,7 @@
 
 fi
 
+ext_shared=$openssl_ext_shared
 
 if test "$OPENSSL_DIR"; then
   
@@ -43816,9 +43823,9 @@
 
   fi
 
-  if test -f "$ORACLE_DIR/lib/sysliblist"; then
+  if test -f "$ORACLE_DIR/${ABILIB}/sysliblist"; then
   	
-  for ac_i in `cat $ORACLE_DIR/lib/sysliblist`; do
+  for ac_i in `cat $ORACLE_DIR/${ABILIB}/sysliblist`; do
     case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
@@ -43853,7 +43860,7 @@
     -L*)
       ac_ii=`echo $ac_i|cut -c 3-`
       
-  if test "$ac_ii" != "/usr/lib"; then
+  if test "$ac_ii" != "/usr/${ABILIB}"; then
     
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
@@ -43866,7 +43873,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ac_ii -L$ac_ii $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ac_ii $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -43889,9 +43896,9 @@
     esac
   done
 
-  elif test -f "$ORACLE_DIR/rdbms/lib/sysliblist"; then
+  elif test -f "$ORACLE_DIR/rdbms/${ABILIB}/sysliblist"; then
   	
-  for ac_i in `cat $ORACLE_DIR/rdbms/lib/sysliblist`; do
+  for ac_i in `cat $ORACLE_DIR/rdbms/${ABILIB}/sysliblist`; do
     case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
@@ -43926,7 +43933,7 @@
     -L*)
       ac_ii=`echo $ac_i|cut -c 3-`
       
-  if test "$ac_ii" != "/usr/lib"; then
+  if test "$ac_ii" != "/usr/${ABILIB}"; then
     
   if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
     ai_p=$ac_ii
@@ -43939,7 +43946,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ac_ii -L$ac_ii $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ac_ii $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -43970,14 +43977,14 @@
   if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
   	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
 	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
-  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
+  elif test -f $ORACLE_DIR/${ABILIB}/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
     ORACLE_VERSION=9.0
-  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
+  elif test -f $ORACLE_DIR/${ABILIB}/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
     ORACLE_VERSION=8.1
-  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
+  elif test -f $ORACLE_DIR/${ABILIB}/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
     ORACLE_VERSION=8.0
-  elif test -f $ORACLE_DIR/lib/libclntsh.a; then
-    if test -f $ORACLE_DIR/lib/libcore4.a; then
+  elif test -f $ORACLE_DIR/${ABILIB}/libclntsh.a; then
+    if test -f $ORACLE_DIR/${ABILIB}/libcore4.a; then
       ORACLE_VERSION=8.0
     else
       ORACLE_VERSION=8.1
@@ -43989,27 +43996,27 @@
 
   case $ORACLE_VERSION in
 	7.0|7.1)
-	  if test -f $ORACLE_DIR/lib/liboracle.$SHLIB_SUFFIX_NAME; then
+	  if test -f $ORACLE_DIR/${ABILIB}/liboracle.$SHLIB_SUFFIX_NAME; then
 	    
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-loracle $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44032,22 +44039,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44089,22 +44096,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcore $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44127,22 +44134,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44183,22 +44190,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcv6 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44221,22 +44228,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44277,22 +44284,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lnlsrtl $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44315,22 +44322,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44371,22 +44378,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcore $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44409,22 +44416,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44465,22 +44472,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcv6 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44503,22 +44510,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44559,22 +44566,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lnlsrtl $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44597,22 +44604,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44653,22 +44660,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lsqlnet $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44691,22 +44698,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44747,22 +44754,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lora $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44785,22 +44792,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44841,22 +44848,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lsqlnet $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44879,22 +44886,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -44932,30 +44939,30 @@
 
 
 		if test "$ext_shared" = "yes"; then
-		  ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib/osntab.o $ORACLE_SHARED_LIBADD";
+		  ORACLE_SHARED_LIBADD="$ORACLE_DIR/${ABILIB}/osntab.o $ORACLE_SHARED_LIBADD";
 		else
-		  LIBS="$ORACLE_DIR/lib/osntab.o $LIBS";
+		  LIBS="$ORACLE_DIR/${ABILIB}/osntab.o $LIBS";
 		fi
 		
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-locic $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -44978,22 +44985,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45032,9 +45039,9 @@
 
 		if test "`uname -s 2>/dev/null`" = "AIX"; then
 		  if test "$ext_shared" = "yes"; then
-		  	ORACLE_SHARED_LIBADD="$ORACLE_SHARED_LIBADD -bI:$ORACLE_DIR/lib/mili.exp"
+		  	ORACLE_SHARED_LIBADD="$ORACLE_SHARED_LIBADD -bI:$ORACLE_DIR/${ABILIB}/mili.exp"
 		  else
-		  	LIBS="$LIBS -bI:$ORACLE_DIR/lib/mili.exp"
+		  	LIBS="$LIBS -bI:$ORACLE_DIR/${ABILIB}/mili.exp"
 		  fi
 		fi
 	  fi
@@ -45041,27 +45048,27 @@
 	  ;;
 
 	7.2)
-	  if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
+	  if test -f $ORACLE_DIR/${ABILIB}/libclntsh.$SHLIB_SUFFIX_NAME; then
 	    
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lclntsh $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45084,22 +45091,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45141,22 +45148,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcore3 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45179,22 +45186,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45235,22 +45242,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45273,22 +45280,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45329,22 +45336,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lc3v6 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45367,22 +45374,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45423,22 +45430,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45461,22 +45468,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45517,22 +45524,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lora $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45555,22 +45562,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45611,22 +45618,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lsqlnet $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45649,22 +45656,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45705,22 +45712,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lora $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45743,22 +45750,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45799,22 +45806,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lsqlnet $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45837,22 +45844,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45890,30 +45897,30 @@
 
 
 		if test "$ext_shared" = "yes"; then
-		  ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib/osntab.o $ORACLE_SHARED_LIBADD";
+		  ORACLE_SHARED_LIBADD="$ORACLE_DIR/${ABILIB}/osntab.o $ORACLE_SHARED_LIBADD";
 		else
-		  LIBS="$ORACLE_DIR/lib/osntab.o $LIBS";
+		  LIBS="$ORACLE_DIR/${ABILIB}/osntab.o $LIBS";
 		fi
 	    
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-locic $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -45936,22 +45943,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -45992,27 +45999,27 @@
 	  ;;
 
 	7.3)
-	  if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
+	  if test -f $ORACLE_DIR/${ABILIB}/libclntsh.$SHLIB_SUFFIX_NAME; then
 	    
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lclntsh $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46035,22 +46042,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46092,22 +46099,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcore3 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46130,22 +46137,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46186,22 +46193,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46224,22 +46231,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46280,22 +46287,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcore3 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46318,22 +46325,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46374,22 +46381,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lc3v6 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46412,22 +46419,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46468,22 +46475,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46506,22 +46513,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46562,22 +46569,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lepc $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46600,22 +46607,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46656,22 +46663,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lgeneric $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46694,22 +46701,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46750,22 +46757,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcommon $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46788,22 +46795,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46844,22 +46851,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lclient $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46882,22 +46889,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -46938,22 +46945,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lsqlnet $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -46976,22 +46983,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47032,22 +47039,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lncr $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47070,22 +47077,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47126,22 +47133,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lsqlnet $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47164,22 +47171,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47220,22 +47227,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lgeneric $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47258,22 +47265,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47314,22 +47321,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lcommon $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47352,22 +47359,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47408,22 +47415,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lclient $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47446,22 +47453,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47502,22 +47509,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lsqlnet $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47540,22 +47547,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47596,22 +47603,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lncr $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47634,22 +47641,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47690,22 +47697,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lsqlnet $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47728,22 +47735,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47784,22 +47791,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lclient $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -47822,22 +47829,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -47884,7 +47891,7 @@
     ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
     if test -n """"; then
       
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -47922,7 +47929,7 @@
 
   if test -n """"; then
     
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -47978,7 +47985,7 @@
     ORACLE_SHARED_LIBADD="-lcore4 $ORACLE_SHARED_LIBADD"
     if test -n """"; then
       
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -48016,7 +48023,7 @@
 
   if test -n """"; then
     
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -48072,7 +48079,7 @@
     ORACLE_SHARED_LIBADD="-lpsa $ORACLE_SHARED_LIBADD"
     if test -n """"; then
       
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -48110,7 +48117,7 @@
 
   if test -n """"; then
     
-  if test """" != "/usr/lib"; then
+  if test """" != "/usr/${ABILIB}"; then
     
   if test -z """" || echo """" | grep '^/' >/dev/null ; then
     ai_p=""
@@ -48164,22 +48171,22 @@
 
   if test "$ext_shared" = "yes"; then
     ORACLE_SHARED_LIBADD="-lclntsh $ORACLE_SHARED_LIBADD"
-    if test -n "$ORACLE_DIR/lib"; then
+    if test -n "$ORACLE_DIR/${ABILIB}"; then
       
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -48202,22 +48209,22 @@
   else
     
 
-  if test -n "$ORACLE_DIR/lib"; then
+  if test -n "$ORACLE_DIR/${ABILIB}"; then
     
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $"
+      ="-L$ORACLE_DIR/${ABILIB} $"
     else
       
   
@@ -48285,20 +48292,20 @@
   esac
 
   	  
-  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+  if test "$ORACLE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ORACLE_DIR/lib
+  if test -z "$ORACLE_DIR/${ABILIB}" || echo "$ORACLE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ORACLE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ORACLE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "ORACLE_SHARED_LIBADD"; then
-      ORACLE_SHARED_LIBADD="-R$ORACLE_DIR/lib -L$ORACLE_DIR/lib $ORACLE_SHARED_LIBADD"
+      ORACLE_SHARED_LIBADD="-L$ORACLE_DIR/${ABILIB} $ORACLE_SHARED_LIBADD"
     else
       
   
@@ -48910,7 +48917,7 @@
   
   PHP_VAR_SUBST="$PHP_VAR_SUBST OVRIMOS_SHARED_LIBADD"
 
-  LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib"
+  LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/${ABILIB} -L$OVRIMOS_DIR/${ABILIB}"
   echo $ac_n "checking for main in -lsqlcli""... $ac_c" 1>&6
 echo "configure:48916: checking for main in -lsqlcli" >&5
 ac_lib_var=`echo sqlcli'_'main | sed 'y%./+-%__p_%'`
@@ -48958,22 +48965,22 @@
 
   if test "$ext_shared" = "yes"; then
     OVRIMOS_SHARED_LIBADD="-lsqlcli $OVRIMOS_SHARED_LIBADD"
-    if test -n "$OVRIMOS_DIR/lib"; then
+    if test -n "$OVRIMOS_DIR/${ABILIB}"; then
       
-  if test "$OVRIMOS_DIR/lib" != "/usr/lib"; then
+  if test "$OVRIMOS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$OVRIMOS_DIR/lib" || echo "$OVRIMOS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$OVRIMOS_DIR/lib
+  if test -z "$OVRIMOS_DIR/${ABILIB}" || echo "$OVRIMOS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$OVRIMOS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $OVRIMOS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $OVRIMOS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OVRIMOS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$OVRIMOS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "OVRIMOS_SHARED_LIBADD"; then
-      OVRIMOS_SHARED_LIBADD="-R$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib $OVRIMOS_SHARED_LIBADD"
+      OVRIMOS_SHARED_LIBADD="-L$OVRIMOS_DIR/${ABILIB} $OVRIMOS_SHARED_LIBADD"
     else
       
   
@@ -48996,22 +49003,22 @@
   else
     
 
-  if test -n "$OVRIMOS_DIR/lib"; then
+  if test -n "$OVRIMOS_DIR/${ABILIB}"; then
     
-  if test "$OVRIMOS_DIR/lib" != "/usr/lib"; then
+  if test "$OVRIMOS_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$OVRIMOS_DIR/lib" || echo "$OVRIMOS_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$OVRIMOS_DIR/lib
+  if test -z "$OVRIMOS_DIR/${ABILIB}" || echo "$OVRIMOS_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$OVRIMOS_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $OVRIMOS_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $OVRIMOS_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OVRIMOS_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$OVRIMOS_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib $"
+      ="-L$OVRIMOS_DIR/${ABILIB} $"
     else
       
   
@@ -50050,7 +50057,7 @@
     fi
 
     test -f $PHP_PCRE_REGEX/libpcre.a && PCRE_LIBDIR=$PHP_PCRE_REGEX
-    test -f $PHP_PCRE_REGEX/lib/libpcre.a && PCRE_LIBDIR=$PHP_PCRE_REGEX/lib
+    test -f $PHP_PCRE_REGEX/${ABILIB}/libpcre.a && PCRE_LIBDIR=$PHP_PCRE_REGEX/${ABILIB}
 
     if test -z "$PCRE_LIBDIR" ; then
       { echo "configure: error: Could not find libpcre.a in $PHP_PCRE_REGEX" 1>&2; exit 1; }
@@ -50062,7 +50069,7 @@
     PCRE_SHARED_LIBADD="-lpcre $PCRE_SHARED_LIBADD"
     if test -n "$PCRE_LIBDIR"; then
       
-  if test "$PCRE_LIBDIR" != "/usr/lib"; then
+  if test "$PCRE_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PCRE_LIBDIR" || echo "$PCRE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PCRE_LIBDIR
@@ -50075,7 +50082,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "PCRE_SHARED_LIBADD"; then
-      PCRE_SHARED_LIBADD="-R$PCRE_LIBDIR -L$PCRE_LIBDIR $PCRE_SHARED_LIBADD"
+      PCRE_SHARED_LIBADD="-L$PCRE_LIBDIR $PCRE_SHARED_LIBADD"
     else
       
   
@@ -50100,7 +50107,7 @@
 
   if test -n "$PCRE_LIBDIR"; then
     
-  if test "$PCRE_LIBDIR" != "/usr/lib"; then
+  if test "$PCRE_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PCRE_LIBDIR" || echo "$PCRE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PCRE_LIBDIR
@@ -50113,7 +50120,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PCRE_LIBDIR -L$PCRE_LIBDIR $"
+      ="-L$PCRE_LIBDIR $"
     else
       
   
@@ -50561,7 +50568,7 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$PHP_JPEG_DIR/lib
+      -L$PHP_JPEG_DIR/${ABILIB}
      $LDFLAGS"
   echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
 echo "configure:50568: checking for jpeg_read_header in -ljpeg" >&5
@@ -50605,22 +50612,22 @@
 
   if test "$ext_shared" = "yes"; then
     PDFLIB_SHARED_LIBADD="-ljpeg $PDFLIB_SHARED_LIBADD"
-    if test -n "$PHP_JPEG_DIR/lib"; then
+    if test -n "$PHP_JPEG_DIR/${ABILIB}"; then
       
-  if test "$PHP_JPEG_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_JPEG_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_JPEG_DIR/lib" || echo "$PHP_JPEG_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_JPEG_DIR/lib
+  if test -z "$PHP_JPEG_DIR/${ABILIB}" || echo "$PHP_JPEG_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_JPEG_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_JPEG_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_JPEG_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_JPEG_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_JPEG_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "PDFLIB_SHARED_LIBADD"; then
-      PDFLIB_SHARED_LIBADD="-R$PHP_JPEG_DIR/lib -L$PHP_JPEG_DIR/lib $PDFLIB_SHARED_LIBADD"
+      PDFLIB_SHARED_LIBADD="-L$PHP_JPEG_DIR/${ABILIB} $PDFLIB_SHARED_LIBADD"
     else
       
   
@@ -50643,22 +50650,22 @@
   else
     
 
-  if test -n "$PHP_JPEG_DIR/lib"; then
+  if test -n "$PHP_JPEG_DIR/${ABILIB}"; then
     
-  if test "$PHP_JPEG_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_JPEG_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_JPEG_DIR/lib" || echo "$PHP_JPEG_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_JPEG_DIR/lib
+  if test -z "$PHP_JPEG_DIR/${ABILIB}" || echo "$PHP_JPEG_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_JPEG_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_JPEG_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_JPEG_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_JPEG_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_JPEG_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_JPEG_DIR/lib -L$PHP_JPEG_DIR/lib $"
+      ="-L$PHP_JPEG_DIR/${ABILIB} $"
     else
       
   
@@ -50765,7 +50772,7 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$PHP_PNG_DIR/lib
+      -L$PHP_PNG_DIR/${ABILIB}
      $LDFLAGS"
   echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6
 echo "configure:50772: checking for png_create_info_struct in -lpng" >&5
@@ -50809,22 +50816,22 @@
 
   if test "$ext_shared" = "yes"; then
     PDFLIB_SHARED_LIBADD="-lpng $PDFLIB_SHARED_LIBADD"
-    if test -n "$PHP_PNG_DIR/lib"; then
+    if test -n "$PHP_PNG_DIR/${ABILIB}"; then
       
-  if test "$PHP_PNG_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_PNG_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_PNG_DIR/lib" || echo "$PHP_PNG_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_PNG_DIR/lib
+  if test -z "$PHP_PNG_DIR/${ABILIB}" || echo "$PHP_PNG_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_PNG_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_PNG_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_PNG_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_PNG_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_PNG_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "PDFLIB_SHARED_LIBADD"; then
-      PDFLIB_SHARED_LIBADD="-R$PHP_PNG_DIR/lib -L$PHP_PNG_DIR/lib $PDFLIB_SHARED_LIBADD"
+      PDFLIB_SHARED_LIBADD="-L$PHP_PNG_DIR/${ABILIB} $PDFLIB_SHARED_LIBADD"
     else
       
   
@@ -50847,22 +50854,22 @@
   else
     
 
-  if test -n "$PHP_PNG_DIR/lib"; then
+  if test -n "$PHP_PNG_DIR/${ABILIB}"; then
     
-  if test "$PHP_PNG_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_PNG_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_PNG_DIR/lib" || echo "$PHP_PNG_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_PNG_DIR/lib
+  if test -z "$PHP_PNG_DIR/${ABILIB}" || echo "$PHP_PNG_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_PNG_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_PNG_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_PNG_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_PNG_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_PNG_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_PNG_DIR/lib -L$PHP_PNG_DIR/lib $"
+      ="-L$PHP_PNG_DIR/${ABILIB} $"
     else
       
   
@@ -50969,7 +50976,7 @@
     
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-      -L$PHP_TIFF_DIR/lib
+      -L$PHP_TIFF_DIR/${ABILIB}
      $LDFLAGS"
   echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
 echo "configure:50976: checking for TIFFOpen in -ltiff" >&5
@@ -51013,22 +51020,22 @@
 
   if test "$ext_shared" = "yes"; then
     PDFLIB_SHARED_LIBADD="-ltiff $PDFLIB_SHARED_LIBADD"
-    if test -n "$PHP_TIFF_DIR/lib"; then
+    if test -n "$PHP_TIFF_DIR/${ABILIB}"; then
       
-  if test "$PHP_TIFF_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_TIFF_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_TIFF_DIR/lib" || echo "$PHP_TIFF_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_TIFF_DIR/lib
+  if test -z "$PHP_TIFF_DIR/${ABILIB}" || echo "$PHP_TIFF_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_TIFF_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_TIFF_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_TIFF_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_TIFF_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_TIFF_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "PDFLIB_SHARED_LIBADD"; then
-      PDFLIB_SHARED_LIBADD="-R$PHP_TIFF_DIR/lib -L$PHP_TIFF_DIR/lib $PDFLIB_SHARED_LIBADD"
+      PDFLIB_SHARED_LIBADD="-L$PHP_TIFF_DIR/${ABILIB} $PDFLIB_SHARED_LIBADD"
     else
       
   
@@ -51051,22 +51058,22 @@
   else
     
 
-  if test -n "$PHP_TIFF_DIR/lib"; then
+  if test -n "$PHP_TIFF_DIR/${ABILIB}"; then
     
-  if test "$PHP_TIFF_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_TIFF_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_TIFF_DIR/lib" || echo "$PHP_TIFF_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_TIFF_DIR/lib
+  if test -z "$PHP_TIFF_DIR/${ABILIB}" || echo "$PHP_TIFF_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_TIFF_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_TIFF_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_TIFF_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_TIFF_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_TIFF_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_TIFF_DIR/lib -L$PHP_TIFF_DIR/lib $"
+      ="-L$PHP_TIFF_DIR/${ABILIB} $"
     else
       
   
@@ -51130,22 +51137,22 @@
 
   if test "$ext_shared" = "yes"; then
     PDFLIB_SHARED_LIBADD="-lz $PDFLIB_SHARED_LIBADD"
-    if test -n "$PHP_ZLIB_DIR/lib"; then
+    if test -n "$PHP_ZLIB_DIR/${ABILIB}"; then
       
-  if test "$PHP_ZLIB_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_ZLIB_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_ZLIB_DIR/lib" || echo "$PHP_ZLIB_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_ZLIB_DIR/lib
+  if test -z "$PHP_ZLIB_DIR/${ABILIB}" || echo "$PHP_ZLIB_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_ZLIB_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_ZLIB_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_ZLIB_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "PDFLIB_SHARED_LIBADD"; then
-      PDFLIB_SHARED_LIBADD="-R$PHP_ZLIB_DIR/lib -L$PHP_ZLIB_DIR/lib $PDFLIB_SHARED_LIBADD"
+      PDFLIB_SHARED_LIBADD="-L$PHP_ZLIB_DIR/${ABILIB} $PDFLIB_SHARED_LIBADD"
     else
       
   
@@ -51168,22 +51175,22 @@
   else
     
 
-  if test -n "$PHP_ZLIB_DIR/lib"; then
+  if test -n "$PHP_ZLIB_DIR/${ABILIB}"; then
     
-  if test "$PHP_ZLIB_DIR/lib" != "/usr/lib"; then
+  if test "$PHP_ZLIB_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_ZLIB_DIR/lib" || echo "$PHP_ZLIB_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_ZLIB_DIR/lib
+  if test -z "$PHP_ZLIB_DIR/${ABILIB}" || echo "$PHP_ZLIB_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_ZLIB_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_ZLIB_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_ZLIB_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_ZLIB_DIR/lib -L$PHP_ZLIB_DIR/lib $"
+      ="-L$PHP_ZLIB_DIR/${ABILIB} $"
     else
       
   
@@ -51312,7 +51319,7 @@
         
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-          -L$PHP_PDFLIB/lib
+          -L$PHP_PDFLIB/${ABILIB}
          $LDFLAGS"
   echo $ac_n "checking for PDF_show_boxed in -lpdf""... $ac_c" 1>&6
 echo "configure:51319: checking for PDF_show_boxed in -lpdf" >&5
@@ -51360,22 +51367,22 @@
 
   if test "$ext_shared" = "yes"; then
     PDFLIB_SHARED_LIBADD="-lpdf $PDFLIB_SHARED_LIBADD"
-    if test -n "$PHP_PDFLIB/lib"; then
+    if test -n "$PHP_PDFLIB/${ABILIB}"; then
       
-  if test "$PHP_PDFLIB/lib" != "/usr/lib"; then
+  if test "$PHP_PDFLIB/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_PDFLIB/lib" || echo "$PHP_PDFLIB/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_PDFLIB/lib
+  if test -z "$PHP_PDFLIB/${ABILIB}" || echo "$PHP_PDFLIB/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_PDFLIB/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_PDFLIB/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_PDFLIB/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_PDFLIB/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_PDFLIB/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "PDFLIB_SHARED_LIBADD"; then
-      PDFLIB_SHARED_LIBADD="-R$PHP_PDFLIB/lib -L$PHP_PDFLIB/lib $PDFLIB_SHARED_LIBADD"
+      PDFLIB_SHARED_LIBADD="-L$PHP_PDFLIB/${ABILIB} $PDFLIB_SHARED_LIBADD"
     else
       
   
@@ -51398,22 +51405,22 @@
   else
     
 
-  if test -n "$PHP_PDFLIB/lib"; then
+  if test -n "$PHP_PDFLIB/${ABILIB}"; then
     
-  if test "$PHP_PDFLIB/lib" != "/usr/lib"; then
+  if test "$PHP_PDFLIB/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$PHP_PDFLIB/lib" || echo "$PHP_PDFLIB/lib" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_PDFLIB/lib
+  if test -z "$PHP_PDFLIB/${ABILIB}" || echo "$PHP_PDFLIB/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_PDFLIB/${ABILIB}
   else
     
-    ep_dir="`echo $PHP_PDFLIB/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_PDFLIB/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_PDFLIB/lib\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_PDFLIB/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PHP_PDFLIB/lib -L$PHP_PDFLIB/lib $"
+      ="-L$PHP_PDFLIB/${ABILIB} $"
     else
       
   
@@ -51563,8 +51570,8 @@
       PFPRO_INC_DIR=$i
     elif test -r $i/include/$PFPRO_HDR; then
       PFPRO_INC_DIR=$i/include
-    elif test -r $i/lib/$PFPRO_HDR; then
-      PFPRO_INC_DIR=$i/lib
+    elif test -r $i/${ABILIB}/$PFPRO_HDR; then
+      PFPRO_INC_DIR=$i/${ABILIB}
     elif test -r $i/bin/$PFPRO_HDR; then
       PFPRO_INC_DIR=$i/bin
     fi
@@ -51571,8 +51578,8 @@
 
     if test -r $i/$PFPRO_LIB; then
       PFPRO_LIB_DIR=$i
-    elif test -r $i/lib/$PFPRO_LIB; then
-      PFPRO_LIB_DIR=$i/lib
+    elif test -r $i/${ABILIB}/$PFPRO_LIB; then
+      PFPRO_LIB_DIR=$i/${ABILIB}
     fi
   done
 
@@ -51645,7 +51652,7 @@
     PFPRO_SHARED_LIBADD="-lpfpro $PFPRO_SHARED_LIBADD"
     if test -n "$PFPRO_LIB_DIR"; then
       
-  if test "$PFPRO_LIB_DIR" != "/usr/lib"; then
+  if test "$PFPRO_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PFPRO_LIB_DIR" || echo "$PFPRO_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PFPRO_LIB_DIR
@@ -51658,7 +51665,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "PFPRO_SHARED_LIBADD"; then
-      PFPRO_SHARED_LIBADD="-R$PFPRO_LIB_DIR -L$PFPRO_LIB_DIR $PFPRO_SHARED_LIBADD"
+      PFPRO_SHARED_LIBADD="-L$PFPRO_LIB_DIR $PFPRO_SHARED_LIBADD"
     else
       
   
@@ -51683,7 +51690,7 @@
 
   if test -n "$PFPRO_LIB_DIR"; then
     
-  if test "$PFPRO_LIB_DIR" != "/usr/lib"; then
+  if test "$PFPRO_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PFPRO_LIB_DIR" || echo "$PFPRO_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$PFPRO_LIB_DIR
@@ -51696,7 +51703,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PFPRO_LIB_DIR -L$PFPRO_LIB_DIR $"
+      ="-L$PFPRO_LIB_DIR $"
     else
       
   
@@ -52025,8 +52032,8 @@
       fi
     done
 
-    for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
-      if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 
+    for j in ${ABILIB} ${ABILIB}/pgsql ${ABILIB}/postgres ${ABILIB}/postgresql ""; do
+      if test -f "$i/$j/libpq.so"; then 
         PGSQL_LIBDIR=$i/$j
       fi
     done
@@ -52318,7 +52325,7 @@
     PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD"
     if test -n "$PGSQL_LIBDIR"; then
       
-  if test "$PGSQL_LIBDIR" != "/usr/lib"; then
+  if test "$PGSQL_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PGSQL_LIBDIR
@@ -52331,7 +52338,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "PGSQL_SHARED_LIBADD"; then
-      PGSQL_SHARED_LIBADD="-R$PGSQL_LIBDIR -L$PGSQL_LIBDIR $PGSQL_SHARED_LIBADD"
+      PGSQL_SHARED_LIBADD="-L$PGSQL_LIBDIR $PGSQL_SHARED_LIBADD"
     else
       
   
@@ -52356,7 +52363,7 @@
 
   if test -n "$PGSQL_LIBDIR"; then
     
-  if test "$PGSQL_LIBDIR" != "/usr/lib"; then
+  if test "$PGSQL_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PGSQL_LIBDIR
@@ -52369,7 +52376,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PGSQL_LIBDIR -L$PGSQL_LIBDIR $"
+      ="-L$PGSQL_LIBDIR $"
     else
       
   
@@ -53244,7 +53251,7 @@
 		{ echo "configure: error: Cannot find pspell" 1>&2; exit 1; }
 	fi
 
-	PSPELL_LIBDIR=$PSPELL_DIR/lib
+	PSPELL_LIBDIR=$PSPELL_DIR/${ABILIB}
 
 	cat >> confdefs.h <<\EOF
 #define HAVE_PSPELL 1
@@ -53259,7 +53266,7 @@
     PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD"
     if test -n "$PSPELL_LIBDIR"; then
       
-  if test "$PSPELL_LIBDIR" != "/usr/lib"; then
+  if test "$PSPELL_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PSPELL_LIBDIR
@@ -53272,7 +53279,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "PSPELL_SHARED_LIBADD"; then
-      PSPELL_SHARED_LIBADD="-R$PSPELL_LIBDIR -L$PSPELL_LIBDIR $PSPELL_SHARED_LIBADD"
+      PSPELL_SHARED_LIBADD="-L$PSPELL_LIBDIR $PSPELL_SHARED_LIBADD"
     else
       
   
@@ -53297,7 +53304,7 @@
 
   if test -n "$PSPELL_LIBDIR"; then
     
-  if test "$PSPELL_LIBDIR" != "/usr/lib"; then
+  if test "$PSPELL_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$PSPELL_LIBDIR
@@ -53310,7 +53317,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$PSPELL_LIBDIR -L$PSPELL_LIBDIR $"
+      ="-L$PSPELL_LIBDIR $"
     else
       
   
@@ -53395,22 +53402,22 @@
         echo "$ac_t""yes" 1>&6
         
 
-  if test -n "$QTDIR/lib"; then
+  if test -n "$QTDIR/${ABILIB}"; then
     
-  if test "$QTDIR/lib" != "/usr/lib"; then
+  if test "$QTDIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$QTDIR/lib" || echo "$QTDIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$QTDIR/lib
+  if test -z "$QTDIR/${ABILIB}" || echo "$QTDIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$QTDIR/${ABILIB}
   else
     
-    ep_dir="`echo $QTDIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $QTDIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$QTDIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$QTDIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$QTDIR/lib -L$QTDIR/lib $"
+      ="-L$QTDIR/${ABILIB} $"
     else
       
   
@@ -53875,7 +53882,7 @@
     php_cxx_done=yes
   fi
 
-      elif test -f /usr/lib/qt2/include/qdom.h; then
+      elif test -f /usr/${ABILIB}/qt2/include/qdom.h; then
         echo "$ac_t""yes" 1>&6
         
  case qt in
@@ -53890,16 +53897,16 @@
   esac
 
         
-  if test "/usr/lib/qt2/include" != "/usr/include"; then
+  if test "/usr/${ABILIB}/qt2/include" != "/usr/include"; then
     
-  if test -z "/usr/lib/qt2/include" || echo "/usr/lib/qt2/include" | grep '^/' >/dev/null ; then
-    ai_p=/usr/lib/qt2/include
+  if test -z "/usr/${ABILIB}/qt2/include" || echo "/usr/${ABILIB}/qt2/include" | grep '^/' >/dev/null ; then
+    ai_p=/usr/${ABILIB}/qt2/include
   else
     
-    ep_dir="`echo /usr/lib/qt2/include|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo /usr/${ABILIB}/qt2/include|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"/usr/lib/qt2/include\"`"
+    ai_p="$ep_realdir/`basename \"/usr/${ABILIB}/qt2/include\"`"
   fi
 
     
@@ -54516,7 +54523,7 @@
     READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
     if test -n ""; then
       
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -54554,7 +54561,7 @@
 
   if test -n ""; then
     
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -54650,7 +54657,7 @@
     READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
     if test -n ""; then
       
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -54688,7 +54695,7 @@
 
   if test -n ""; then
     
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -54750,7 +54757,7 @@
   
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-    -L$READLINE_DIR/lib 
+    -L$READLINE_DIR/${ABILIB} 
    $LDFLAGS"
   echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
 echo "configure:54757: checking for readline in -lreadline" >&5
@@ -54794,22 +54801,22 @@
 
   if test "$ext_shared" = "yes"; then
     READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD"
-    if test -n "$READLINE_DIR/lib"; then
+    if test -n "$READLINE_DIR/${ABILIB}"; then
       
-  if test "$READLINE_DIR/lib" != "/usr/lib"; then
+  if test "$READLINE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$READLINE_DIR/lib" || echo "$READLINE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$READLINE_DIR/lib
+  if test -z "$READLINE_DIR/${ABILIB}" || echo "$READLINE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$READLINE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $READLINE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $READLINE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$READLINE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$READLINE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "READLINE_SHARED_LIBADD"; then
-      READLINE_SHARED_LIBADD="-R$READLINE_DIR/lib -L$READLINE_DIR/lib $READLINE_SHARED_LIBADD"
+      READLINE_SHARED_LIBADD="-L$READLINE_DIR/${ABILIB} $READLINE_SHARED_LIBADD"
     else
       
   
@@ -54832,22 +54839,22 @@
   else
     
 
-  if test -n "$READLINE_DIR/lib"; then
+  if test -n "$READLINE_DIR/${ABILIB}"; then
     
-  if test "$READLINE_DIR/lib" != "/usr/lib"; then
+  if test "$READLINE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$READLINE_DIR/lib" || echo "$READLINE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$READLINE_DIR/lib
+  if test -z "$READLINE_DIR/${ABILIB}" || echo "$READLINE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$READLINE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $READLINE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $READLINE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$READLINE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$READLINE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$READLINE_DIR/lib -L$READLINE_DIR/lib $"
+      ="-L$READLINE_DIR/${ABILIB} $"
     else
       
   
@@ -54900,7 +54907,7 @@
   
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-    -L$READLINE_DIR/lib 
+    -L$READLINE_DIR/${ABILIB} 
    $LDFLAGS"
   echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
 echo "configure:54907: checking for add_history in -lhistory" >&5
@@ -54944,22 +54951,22 @@
 
   if test "$ext_shared" = "yes"; then
     READLINE_SHARED_LIBADD="-lhistory $READLINE_SHARED_LIBADD"
-    if test -n "$READLINE_DIR/lib"; then
+    if test -n "$READLINE_DIR/${ABILIB}"; then
       
-  if test "$READLINE_DIR/lib" != "/usr/lib"; then
+  if test "$READLINE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$READLINE_DIR/lib" || echo "$READLINE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$READLINE_DIR/lib
+  if test -z "$READLINE_DIR/${ABILIB}" || echo "$READLINE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$READLINE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $READLINE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $READLINE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$READLINE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$READLINE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "READLINE_SHARED_LIBADD"; then
-      READLINE_SHARED_LIBADD="-R$READLINE_DIR/lib -L$READLINE_DIR/lib $READLINE_SHARED_LIBADD"
+      READLINE_SHARED_LIBADD="-L$READLINE_DIR/${ABILIB} $READLINE_SHARED_LIBADD"
     else
       
   
@@ -54982,22 +54989,22 @@
   else
     
 
-  if test -n "$READLINE_DIR/lib"; then
+  if test -n "$READLINE_DIR/${ABILIB}"; then
     
-  if test "$READLINE_DIR/lib" != "/usr/lib"; then
+  if test "$READLINE_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$READLINE_DIR/lib" || echo "$READLINE_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$READLINE_DIR/lib
+  if test -z "$READLINE_DIR/${ABILIB}" || echo "$READLINE_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$READLINE_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $READLINE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $READLINE_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$READLINE_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$READLINE_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$READLINE_DIR/lib -L$READLINE_DIR/lib $"
+      ="-L$READLINE_DIR/${ABILIB} $"
     else
       
   
@@ -55346,7 +55353,7 @@
     READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
     if test -n ""; then
       
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -55384,7 +55391,7 @@
 
   if test -n ""; then
     
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -55480,7 +55487,7 @@
     READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
     if test -n ""; then
       
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -55518,7 +55525,7 @@
 
   if test -n ""; then
     
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -55580,7 +55587,7 @@
   
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-    -L$READLINE_DIR/lib 
+    -L$READLINE_DIR/${ABILIB} 
    $LDFLAGS"
   echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
 echo "configure:55587: checking for readline in -ledit" >&5
@@ -55624,22 +55631,22 @@
 
   if test "$ext_shared" = "yes"; then
     READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD"
-    if test -n "$LIBEDIT_DIR/lib"; then
+    if test -n "$LIBEDIT_DIR/${ABILIB}"; then
       
-  if test "$LIBEDIT_DIR/lib" != "/usr/lib"; then
+  if test "$LIBEDIT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$LIBEDIT_DIR/lib" || echo "$LIBEDIT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$LIBEDIT_DIR/lib
+  if test -z "$LIBEDIT_DIR/${ABILIB}" || echo "$LIBEDIT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$LIBEDIT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $LIBEDIT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $LIBEDIT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "READLINE_SHARED_LIBADD"; then
-      READLINE_SHARED_LIBADD="-R$LIBEDIT_DIR/lib -L$LIBEDIT_DIR/lib $READLINE_SHARED_LIBADD"
+      READLINE_SHARED_LIBADD="-L$LIBEDIT_DIR/${ABILIB} $READLINE_SHARED_LIBADD"
     else
       
   
@@ -55662,22 +55669,22 @@
   else
     
 
-  if test -n "$LIBEDIT_DIR/lib"; then
+  if test -n "$LIBEDIT_DIR/${ABILIB}"; then
     
-  if test "$LIBEDIT_DIR/lib" != "/usr/lib"; then
+  if test "$LIBEDIT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$LIBEDIT_DIR/lib" || echo "$LIBEDIT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$LIBEDIT_DIR/lib
+  if test -z "$LIBEDIT_DIR/${ABILIB}" || echo "$LIBEDIT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$LIBEDIT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $LIBEDIT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $LIBEDIT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$LIBEDIT_DIR/lib -L$LIBEDIT_DIR/lib $"
+      ="-L$LIBEDIT_DIR/${ABILIB} $"
     else
       
   
@@ -56088,7 +56095,7 @@
     RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
     if test -n "$RECODE_DIR/$RECODE_LIB"; then
       
-  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
+  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/${ABILIB}"; then
     
   if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
     ai_p=$RECODE_DIR/$RECODE_LIB
@@ -56101,7 +56108,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "RECODE_SHARED_LIBADD"; then
-      RECODE_SHARED_LIBADD="-R$RECODE_DIR/$RECODE_LIB -L$RECODE_DIR/$RECODE_LIB $RECODE_SHARED_LIBADD"
+      RECODE_SHARED_LIBADD="-L$RECODE_DIR/$RECODE_LIB $RECODE_SHARED_LIBADD"
     else
       
   
@@ -56126,7 +56133,7 @@
 
   if test -n "$RECODE_DIR/$RECODE_LIB"; then
     
-  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
+  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/${ABILIB}"; then
     
   if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
     ai_p=$RECODE_DIR/$RECODE_LIB
@@ -56139,7 +56146,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$RECODE_DIR/$RECODE_LIB -L$RECODE_DIR/$RECODE_LIB $"
+      ="-L$RECODE_DIR/$RECODE_LIB $"
     else
       
   
@@ -56182,7 +56189,7 @@
 		else
 			
   
-  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
+  if test "$RECODE_DIR/$RECODE_LIB" != "/usr/${ABILIB}"; then
     
   if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
     ai_p=$RECODE_DIR/$RECODE_LIB
@@ -56195,7 +56202,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$RECODE_DIR/$RECODE_LIB -L$RECODE_DIR/$RECODE_LIB $"
+      ="-L$RECODE_DIR/$RECODE_LIB $"
     else
       
   
@@ -56596,22 +56603,22 @@
 
   if test "$ext_shared" = "yes"; then
     SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD"
-    if test -n "$MM_DIR/lib"; then
+    if test -n "$MM_DIR/${ABILIB}"; then
       
-  if test "$MM_DIR/lib" != "/usr/lib"; then
+  if test "$MM_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MM_DIR/lib" || echo "$MM_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MM_DIR/lib
+  if test -z "$MM_DIR/${ABILIB}" || echo "$MM_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MM_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MM_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MM_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MM_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MM_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "SESSION_SHARED_LIBADD"; then
-      SESSION_SHARED_LIBADD="-R$MM_DIR/lib -L$MM_DIR/lib $SESSION_SHARED_LIBADD"
+      SESSION_SHARED_LIBADD="-L$MM_DIR/${ABILIB} $SESSION_SHARED_LIBADD"
     else
       
   
@@ -56634,22 +56641,22 @@
   else
     
 
-  if test -n "$MM_DIR/lib"; then
+  if test -n "$MM_DIR/${ABILIB}"; then
     
-  if test "$MM_DIR/lib" != "/usr/lib"; then
+  if test "$MM_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$MM_DIR/lib" || echo "$MM_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$MM_DIR/lib
+  if test -z "$MM_DIR/${ABILIB}" || echo "$MM_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$MM_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $MM_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $MM_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MM_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$MM_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$MM_DIR/lib -L$MM_DIR/lib $"
+      ="-L$MM_DIR/${ABILIB} $"
     else
       
   
@@ -57521,12 +57528,12 @@
         test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
       done
       for i in /usr /usr/snmp /usr/local /usr/local/snmp; do
-        test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib
+        test -f $i/${ABILIB}/libsnmp.a -o -f $i/${ABILIB}/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/${ABILIB}
       done
     else
       SNMP_INCDIR=$PHP_SNMP/include
       test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp
-      SNMP_LIBDIR=$PHP_SNMP/lib
+      SNMP_LIBDIR=$PHP_SNMP/${ABILIB}
     fi
 
     if test -z "$SNMP_INCDIR"; then
@@ -57779,7 +57786,7 @@
     SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD"
     if test -n "$SNMP_LIBDIR"; then
       
-  if test "$SNMP_LIBDIR" != "/usr/lib"; then
+  if test "$SNMP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SNMP_LIBDIR
@@ -57792,7 +57799,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "SNMP_SHARED_LIBADD"; then
-      SNMP_SHARED_LIBADD="-R$SNMP_LIBDIR -L$SNMP_LIBDIR $SNMP_SHARED_LIBADD"
+      SNMP_SHARED_LIBADD="-L$SNMP_LIBDIR $SNMP_SHARED_LIBADD"
     else
       
   
@@ -57817,7 +57824,7 @@
 
   if test -n "$SNMP_LIBDIR"; then
     
-  if test "$SNMP_LIBDIR" != "/usr/lib"; then
+  if test "$SNMP_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SNMP_LIBDIR
@@ -57830,7 +57837,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$SNMP_LIBDIR -L$SNMP_LIBDIR $"
+      ="-L$SNMP_LIBDIR $"
     else
       
   
@@ -59339,13 +59346,13 @@
 
 
 if test "$PHP_SWF" != "no"; then
-  if test -r $PHP_SWF/lib/libswf.a; then
+  if test -r $PHP_SWF/${ABILIB}/libswf.a; then
     SWF_DIR=$PHP_SWF
   else
     echo $ac_n "checking for libswf in default path""... $ac_c" 1>&6
 echo "configure:59347: checking for libswf in default path" >&5
     for i in /usr/local /usr; do
-      if test -r $i/lib/libswf.a; then
+      if test -r $i/${ABILIB}/libswf.a; then
         SWF_DIR=$i
         echo "$ac_t""found in $i" 1>&6
       fi
@@ -59356,7 +59363,7 @@
     echo "$ac_t""not found" 1>&6
     { echo "configure: error: Please reinstall the libswf distribution -
    swf.h should be <swf-dir>/include and
-   libswf.a should be in <swf-dir>/lib" 1>&2; exit 1; }
+   libswf.a should be in <swf-dir>/${ABILIB}" 1>&2; exit 1; }
   fi
 
   
@@ -59398,22 +59405,22 @@
 
   if test "$ext_shared" = "yes"; then
     SWF_SHARED_LIBADD="-lswf $SWF_SHARED_LIBADD"
-    if test -n "$SWF_DIR/lib"; then
+    if test -n "$SWF_DIR/${ABILIB}"; then
       
-  if test "$SWF_DIR/lib" != "/usr/lib"; then
+  if test "$SWF_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$SWF_DIR/lib" || echo "$SWF_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$SWF_DIR/lib
+  if test -z "$SWF_DIR/${ABILIB}" || echo "$SWF_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$SWF_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $SWF_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $SWF_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$SWF_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$SWF_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "SWF_SHARED_LIBADD"; then
-      SWF_SHARED_LIBADD="-R$SWF_DIR/lib -L$SWF_DIR/lib $SWF_SHARED_LIBADD"
+      SWF_SHARED_LIBADD="-L$SWF_DIR/${ABILIB} $SWF_SHARED_LIBADD"
     else
       
   
@@ -59436,22 +59443,22 @@
   else
     
 
-  if test -n "$SWF_DIR/lib"; then
+  if test -n "$SWF_DIR/${ABILIB}"; then
     
-  if test "$SWF_DIR/lib" != "/usr/lib"; then
+  if test "$SWF_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$SWF_DIR/lib" || echo "$SWF_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$SWF_DIR/lib
+  if test -z "$SWF_DIR/${ABILIB}" || echo "$SWF_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$SWF_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $SWF_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $SWF_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$SWF_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$SWF_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$SWF_DIR/lib -L$SWF_DIR/lib $"
+      ="-L$SWF_DIR/${ABILIB} $"
     else
       
   
@@ -59754,10 +59761,10 @@
 if test "$PHP_SYBASE" != "no"; then
   if test "$PHP_SYBASE" = "yes"; then
     SYBASE_INCDIR=/home/sybase/include
-    SYBASE_LIBDIR=/home/sybase/lib
+    SYBASE_LIBDIR=/home/sybase/${ABILIB}
   else
     SYBASE_INCDIR=$PHP_SYBASE/include
-    SYBASE_LIBDIR=$PHP_SYBASE/lib
+    SYBASE_LIBDIR=$PHP_SYBASE/${ABILIB}
   fi
   
   if test "$SYBASE_INCDIR" != "/usr/include"; then
@@ -59796,7 +59803,7 @@
     SYBASE_SHARED_LIBADD="-lsybdb $SYBASE_SHARED_LIBADD"
     if test -n "$SYBASE_LIBDIR"; then
       
-  if test "$SYBASE_LIBDIR" != "/usr/lib"; then
+  if test "$SYBASE_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$SYBASE_LIBDIR" || echo "$SYBASE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SYBASE_LIBDIR
@@ -59809,7 +59816,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "SYBASE_SHARED_LIBADD"; then
-      SYBASE_SHARED_LIBADD="-R$SYBASE_LIBDIR -L$SYBASE_LIBDIR $SYBASE_SHARED_LIBADD"
+      SYBASE_SHARED_LIBADD="-L$SYBASE_LIBDIR $SYBASE_SHARED_LIBADD"
     else
       
   
@@ -59834,7 +59841,7 @@
 
   if test -n "$SYBASE_LIBDIR"; then
     
-  if test "$SYBASE_LIBDIR" != "/usr/lib"; then
+  if test "$SYBASE_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$SYBASE_LIBDIR" || echo "$SYBASE_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SYBASE_LIBDIR
@@ -59847,7 +59854,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$SYBASE_LIBDIR -L$SYBASE_LIBDIR $"
+      ="-L$SYBASE_LIBDIR $"
     else
       
   
@@ -60130,7 +60137,7 @@
     SYBASE_SHARED_LIBADD="-ldnet_stub $SYBASE_SHARED_LIBADD"
     if test -n ""; then
       
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -60168,7 +60175,7 @@
 
   if test -n ""; then
     
-  if test "" != "/usr/lib"; then
+  if test "" != "/usr/${ABILIB}"; then
     
   if test -z "" || echo "" | grep '^/' >/dev/null ; then
     ai_p=
@@ -60550,10 +60557,10 @@
   
   if test "$PHP_SYBASE_CT" = "yes"; then
     SYBASE_CT_INCDIR=/home/sybase/include
-    SYBASE_CT_LIBDIR=/home/sybase/lib
+    SYBASE_CT_LIBDIR=/home/sybase/${ABILIB}
   else
     SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include
-    SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
+    SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/${ABILIB}
   fi
 
   if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
@@ -60593,7 +60600,7 @@
   fi
   
   
-  if test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then
+  if test "$SYBASE_CT_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$SYBASE_CT_LIBDIR
@@ -60606,7 +60613,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "SYBASE_CT_SHARED_LIBADD"; then
-      SYBASE_CT_SHARED_LIBADD="-R$SYBASE_CT_LIBDIR -L$SYBASE_CT_LIBDIR $SYBASE_CT_SHARED_LIBADD"
+      SYBASE_CT_SHARED_LIBADD="-L$SYBASE_CT_LIBDIR $SYBASE_CT_SHARED_LIBADD"
     else
       
   
@@ -61927,8 +61934,8 @@
 
 		if test -r $i/libvpopmail.a; then
 			VPOPMAIL_LIB_DIR=$i
-		elif test -r $i/lib/libvpopmail.a; then
-			VPOPMAIL_LIB_DIR=$i/lib
+		elif test -r $i/${ABILIB}/libvpopmail.a; then
+			VPOPMAIL_LIB_DIR=$i/${ABILIB}
 		fi
 
 		if test -x $i/vadddomain; then
@@ -62060,7 +62067,7 @@
     VPOPMAIL_SHARED_LIBADD="-lvpopmail $VPOPMAIL_SHARED_LIBADD"
     if test -n "$VPOPMAIL_LIB_DIR"; then
       
-  if test "$VPOPMAIL_LIB_DIR" != "/usr/lib"; then
+  if test "$VPOPMAIL_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$VPOPMAIL_LIB_DIR" || echo "$VPOPMAIL_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$VPOPMAIL_LIB_DIR
@@ -62073,7 +62080,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "VPOPMAIL_SHARED_LIBADD"; then
-      VPOPMAIL_SHARED_LIBADD="-R$VPOPMAIL_LIB_DIR -L$VPOPMAIL_LIB_DIR $VPOPMAIL_SHARED_LIBADD"
+      VPOPMAIL_SHARED_LIBADD="-L$VPOPMAIL_LIB_DIR $VPOPMAIL_SHARED_LIBADD"
     else
       
   
@@ -62098,7 +62105,7 @@
 
   if test -n "$VPOPMAIL_LIB_DIR"; then
     
-  if test "$VPOPMAIL_LIB_DIR" != "/usr/lib"; then
+  if test "$VPOPMAIL_LIB_DIR" != "/usr/${ABILIB}"; then
     
   if test -z "$VPOPMAIL_LIB_DIR" || echo "$VPOPMAIL_LIB_DIR" | grep '^/' >/dev/null ; then
     ai_p=$VPOPMAIL_LIB_DIR
@@ -62111,7 +62118,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$VPOPMAIL_LIB_DIR -L$VPOPMAIL_LIB_DIR $"
+      ="-L$VPOPMAIL_LIB_DIR $"
     else
       
   
@@ -63392,7 +63399,7 @@
 
 
   for i in $PHP_XML $PHP_EXPAT_DIR; do
-    if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
+    if test -f $i/${ABILIB}/libexpat.a -o -f $i/${ABILIB}/libexpat.$SHLIB_SUFFIX_NAME ; then
       EXPAT_DIR=$i
     fi
   done
@@ -63436,22 +63443,22 @@
 
   if test "$ext_shared" = "yes"; then
     EXPAT_SHARED_LIBADD="-lexpat $EXPAT_SHARED_LIBADD"
-    if test -n "$EXPAT_DIR/lib"; then
+    if test -n "$EXPAT_DIR/${ABILIB}"; then
       
-  if test "$EXPAT_DIR/lib" != "/usr/lib"; then
+  if test "$EXPAT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$EXPAT_DIR/lib" || echo "$EXPAT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$EXPAT_DIR/lib
+  if test -z "$EXPAT_DIR/${ABILIB}" || echo "$EXPAT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$EXPAT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $EXPAT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $EXPAT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "EXPAT_SHARED_LIBADD"; then
-      EXPAT_SHARED_LIBADD="-R$EXPAT_DIR/lib -L$EXPAT_DIR/lib $EXPAT_SHARED_LIBADD"
+      EXPAT_SHARED_LIBADD="-L$EXPAT_DIR/${ABILIB} $EXPAT_SHARED_LIBADD"
     else
       
   
@@ -63474,22 +63481,22 @@
   else
     
 
-  if test -n "$EXPAT_DIR/lib"; then
+  if test -n "$EXPAT_DIR/${ABILIB}"; then
     
-  if test "$EXPAT_DIR/lib" != "/usr/lib"; then
+  if test "$EXPAT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$EXPAT_DIR/lib" || echo "$EXPAT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$EXPAT_DIR/lib
+  if test -z "$EXPAT_DIR/${ABILIB}" || echo "$EXPAT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$EXPAT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $EXPAT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $EXPAT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$EXPAT_DIR/lib -L$EXPAT_DIR/lib $"
+      EXPAT_SHARED_LIBADD="-L$EXPAT_DIR/${ABILIB} $EXPAT_SHARED_LIBADD"
     else
       
   
@@ -63547,7 +63554,7 @@
 
 if test -n "for XMLRPC-EPI support"; then
   echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
-echo "configure:63551: checking for XMLRPC-EPI support" >&5
+echo "configure:63947: checking for XMLRPC-EPI support" >&5
 fi
 # Check whether --with-xmlrpc or --without-xmlrpc was given.
 if test "${with_xmlrpc+set}" = set; then
@@ -63910,7 +63917,7 @@
 
   testval=no
   for i in /usr /usr/local $PHP_EXPAT_DIR $XMLRPC_DIR; do
-    if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
+    if test -f $i/${ABILIB}/libexpat.a -o -f $i/${ABILIB}/libexpat.$SHLIB_SUFFIX_NAME; then
       cat >> confdefs.h <<\EOF
 #define HAVE_LIBEXPAT2 1
 EOF
@@ -63919,22 +63926,22 @@
 
   if test "$ext_shared" = "yes"; then
     XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD"
-    if test -n "$i/lib"; then
+    if test -n "$i/${ABILIB}"; then
       
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "XMLRPC_SHARED_LIBADD"; then
-      XMLRPC_SHARED_LIBADD="-R$i/lib -L$i/lib $XMLRPC_SHARED_LIBADD"
+      XMLRPC_SHARED_LIBADD="-L$i/${ABILIB} $XMLRPC_SHARED_LIBADD"
     else
       
   
@@ -63957,22 +63964,22 @@
   else
     
 
-  if test -n "$i/lib"; then
+  if test -n "$i/${ABILIB}"; then
     
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/lib -L$i/lib $"
+      XMLRPC_SHARED_LIBADD="-L$i/${ABILIB} $XMLRPC_SHARED_LIBADD"
     else
       
   
@@ -64190,13 +64197,13 @@
       { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
     fi
   
-    if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
-       test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+    if test -f $ICONV_DIR/${ABILIB}/lib$iconv_lib_name.a ||
+       test -f $ICONV_DIR/${ABILIB}/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
       
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-        -L$ICONV_DIR/lib
+        -L$ICONV_DIR/${ABILIB}
        $LDFLAGS"
   echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
 echo "configure:64203: checking for libiconv in -l$iconv_lib_name" >&5
@@ -64251,7 +64258,7 @@
         
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-          -L$ICONV_DIR/lib
+          -L$ICONV_DIR/${ABILIB}
          $LDFLAGS"
   echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
 echo "configure:64258: checking for iconv in -l$iconv_lib_name" >&5
@@ -64319,22 +64326,22 @@
 
   if test "$ext_shared" = "yes"; then
     XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD"
-    if test -n "$ICONV_DIR/lib"; then
+    if test -n "$ICONV_DIR/${ABILIB}"; then
       
-  if test "$ICONV_DIR/lib" != "/usr/lib"; then
+  if test "$ICONV_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ICONV_DIR/lib" || echo "$ICONV_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ICONV_DIR/lib
+  if test -z "$ICONV_DIR/${ABILIB}" || echo "$ICONV_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ICONV_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ICONV_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ICONV_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ICONV_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "XMLRPC_SHARED_LIBADD"; then
-      XMLRPC_SHARED_LIBADD="-R$ICONV_DIR/lib -L$ICONV_DIR/lib $XMLRPC_SHARED_LIBADD"
+      XMLRPC_SHARED_LIBADD="-L$ICONV_DIR/${ABILIB} $XMLRPC_SHARED_LIBADD"
     else
       
   
@@ -64357,22 +64364,22 @@
   else
     
 
-  if test -n "$ICONV_DIR/lib"; then
+  if test -n "$ICONV_DIR/${ABILIB}"; then
     
-  if test "$ICONV_DIR/lib" != "/usr/lib"; then
+  if test "$ICONV_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ICONV_DIR/lib" || echo "$ICONV_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ICONV_DIR/lib
+  if test -z "$ICONV_DIR/${ABILIB}" || echo "$ICONV_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ICONV_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ICONV_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ICONV_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ICONV_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ICONV_DIR/lib -L$ICONV_DIR/lib $"
+      ="-L$ICONV_DIR/${ABILIB} $"
     else
       
   
@@ -65096,22 +65103,22 @@
 
   if test "$ext_shared" = "yes"; then
     XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD"
-    if test -n "$XMLRPC_DIR/lib"; then
+    if test -n "$XMLRPC_DIR/${ABILIB}"; then
       
-  if test "$XMLRPC_DIR/lib" != "/usr/lib"; then
+  if test "$XMLRPC_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$XMLRPC_DIR/lib" || echo "$XMLRPC_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$XMLRPC_DIR/lib
+  if test -z "$XMLRPC_DIR/${ABILIB}" || echo "$XMLRPC_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$XMLRPC_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $XMLRPC_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $XMLRPC_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "XMLRPC_SHARED_LIBADD"; then
-      XMLRPC_SHARED_LIBADD="-R$XMLRPC_DIR/lib -L$XMLRPC_DIR/lib $XMLRPC_SHARED_LIBADD"
+      XMLRPC_SHARED_LIBADD="-L$XMLRPC_DIR/${ABILIB} $XMLRPC_SHARED_LIBADD"
     else
       
   
@@ -65134,22 +65141,22 @@
   else
     
 
-  if test -n "$XMLRPC_DIR/lib"; then
+  if test -n "$XMLRPC_DIR/${ABILIB}"; then
     
-  if test "$XMLRPC_DIR/lib" != "/usr/lib"; then
+  if test "$XMLRPC_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$XMLRPC_DIR/lib" || echo "$XMLRPC_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$XMLRPC_DIR/lib
+  if test -z "$XMLRPC_DIR/${ABILIB}" || echo "$XMLRPC_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$XMLRPC_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $XMLRPC_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $XMLRPC_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$XMLRPC_DIR/lib -L$XMLRPC_DIR/lib $"
+      ="-L$XMLRPC_DIR/${ABILIB} $"
     else
       
   
@@ -65290,8 +65297,10 @@
 
 
 
+xslt_ext_shared=$ext_shared
 
 
+
 if test -n "libexpat dir for Sablotron XSL support"; then
   echo $ac_n "checking libexpat dir for Sablotron XSL support""... $ac_c" 1>&6
 echo "configure:65298: checking libexpat dir for Sablotron XSL support" >&5
@@ -65386,7 +65395,7 @@
 fi
 
 
-
+ext_shared=$xslt_ext_shared
 
 if test "$PHP_XSLT" != "no"; then
 
@@ -65418,9 +65427,9 @@
 LTLIBRARY_SHARED_OBJECTS = \$(LTLIBRARY_OBJECTS:.lo=.slo)
 EOF
 
-  if test "" = "shared" || test "" = "yes"; then
+  if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
     lib_build_shared=yes
-    if test -n ""; then
+    if test -n "$ext_shared"; then
       
   lib_target="\$(LTLIBRARY_NAME)"
   cat >>$lib_makefile<<EOF
@@ -65633,7 +65642,7 @@
   if test "$PHP_XSLT_SABLOT" != "no"; then
     found_expat=no
     for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do
-      if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
+      if test -f $i/${ABILIB}/libexpat.a -o -f $i/${ABILIB}/libexpat.$SHLIB_SUFFIX_NAME; then
         cat >> confdefs.h <<\EOF
 #define HAVE_LIBEXPAT2 1
 EOF
@@ -65673,22 +65682,22 @@
 
   if test "$ext_shared" = "yes"; then
     XSLT_SHARED_LIBADD="-lexpat $XSLT_SHARED_LIBADD"
-    if test -n "$i/lib"; then
+    if test -n "$i/${ABILIB}"; then
       
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "XSLT_SHARED_LIBADD"; then
-      XSLT_SHARED_LIBADD="-R$i/lib -L$i/lib $XSLT_SHARED_LIBADD"
+      XSLT_SHARED_LIBADD="-L$i/${ABILIB} $XSLT_SHARED_LIBADD"
     else
       
   
@@ -65711,22 +65720,22 @@
   else
     
 
-  if test -n "$i/lib"; then
+  if test -n "$i/${ABILIB}"; then
     
-  if test "$i/lib" != "/usr/lib"; then
+  if test "$i/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then
-    ai_p=$i/lib
+  if test -z "$i/${ABILIB}" || echo "$i/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$i/${ABILIB}
   else
     
-    ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $i/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/lib\"`"
+    ai_p="$ep_realdir/`basename \"$i/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$i/lib -L$i/lib $"
+      XSLT_SHARED_LIBADD="-L$i/${ABILIB} $XSLT_SHARED_LIBADD"
     else
       
   
@@ -65911,13 +65920,13 @@
       { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
     fi
   
-    if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
-       test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+    if test -f $ICONV_DIR/${ABILIB}/lib$iconv_lib_name.a ||
+       test -f $ICONV_DIR/${ABILIB}/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
       
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-        -L$ICONV_DIR/lib
+        -L$ICONV_DIR/${ABILIB}
        $LDFLAGS"
   echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
 echo "configure:65924: checking for libiconv in -l$iconv_lib_name" >&5
@@ -65972,7 +65981,7 @@
         
   save_old_LDFLAGS=$LDFLAGS
   LDFLAGS="
-          -L$ICONV_DIR/lib
+          -L$ICONV_DIR/${ABILIB}
          $LDFLAGS"
   echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
 echo "configure:65979: checking for iconv in -l$iconv_lib_name" >&5
@@ -66040,22 +66049,22 @@
 
   if test "$ext_shared" = "yes"; then
     XSLT_SHARED_LIBADD="-l$iconv_lib_name $XSLT_SHARED_LIBADD"
-    if test -n "$ICONV_DIR/lib"; then
+    if test -n "$ICONV_DIR/${ABILIB}"; then
       
-  if test "$ICONV_DIR/lib" != "/usr/lib"; then
+  if test "$ICONV_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ICONV_DIR/lib" || echo "$ICONV_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ICONV_DIR/lib
+  if test -z "$ICONV_DIR/${ABILIB}" || echo "$ICONV_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ICONV_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ICONV_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ICONV_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ICONV_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "XSLT_SHARED_LIBADD"; then
-      XSLT_SHARED_LIBADD="-R$ICONV_DIR/lib -L$ICONV_DIR/lib $XSLT_SHARED_LIBADD"
+      XSLT_SHARED_LIBADD="-L$ICONV_DIR/${ABILIB} $XSLT_SHARED_LIBADD"
     else
       
   
@@ -66078,22 +66087,22 @@
   else
     
 
-  if test -n "$ICONV_DIR/lib"; then
+  if test -n "$ICONV_DIR/${ABILIB}"; then
     
-  if test "$ICONV_DIR/lib" != "/usr/lib"; then
+  if test "$ICONV_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$ICONV_DIR/lib" || echo "$ICONV_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$ICONV_DIR/lib
+  if test -z "$ICONV_DIR/${ABILIB}" || echo "$ICONV_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$ICONV_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $ICONV_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $ICONV_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$ICONV_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ICONV_DIR/lib -L$ICONV_DIR/lib $"
+      ="-L$ICONV_DIR/${ABILIB} $"
     else
       
   
@@ -66316,22 +66325,22 @@
 
   if test "$ext_shared" = "yes"; then
     XSLT_SHARED_LIBADD="-l$XSLT_LIBNAME $XSLT_SHARED_LIBADD"
-    if test -n "$XSLT_DIR/lib"; then
+    if test -n "$XSLT_DIR/${ABILIB}"; then
       
-  if test "$XSLT_DIR/lib" != "/usr/lib"; then
+  if test "$XSLT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$XSLT_DIR/lib" || echo "$XSLT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$XSLT_DIR/lib
+  if test -z "$XSLT_DIR/${ABILIB}" || echo "$XSLT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$XSLT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $XSLT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $XSLT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$XSLT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$XSLT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n "XSLT_SHARED_LIBADD"; then
-      XSLT_SHARED_LIBADD="-R$XSLT_DIR/lib -L$XSLT_DIR/lib $XSLT_SHARED_LIBADD"
+      XSLT_SHARED_LIBADD="-L$XSLT_DIR/${ABILIB} $XSLT_SHARED_LIBADD"
     else
       
   
@@ -66354,22 +66363,22 @@
   else
     
 
-  if test -n "$XSLT_DIR/lib"; then
+  if test -n "$XSLT_DIR/${ABILIB}"; then
     
-  if test "$XSLT_DIR/lib" != "/usr/lib"; then
+  if test "$XSLT_DIR/${ABILIB}" != "/usr/${ABILIB}"; then
     
-  if test -z "$XSLT_DIR/lib" || echo "$XSLT_DIR/lib" | grep '^/' >/dev/null ; then
-    ai_p=$XSLT_DIR/lib
+  if test -z "$XSLT_DIR/${ABILIB}" || echo "$XSLT_DIR/${ABILIB}" | grep '^/' >/dev/null ; then
+    ai_p=$XSLT_DIR/${ABILIB}
   else
     
-    ep_dir="`echo $XSLT_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $XSLT_DIR/${ABILIB}|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$XSLT_DIR/lib\"`"
+    ai_p="$ep_realdir/`basename \"$XSLT_DIR/${ABILIB}\"`"
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$XSLT_DIR/lib -L$XSLT_DIR/lib $"
+      ="-L$XSLT_DIR/${ABILIB} $"
     else
       
   
@@ -66527,7 +66536,7 @@
     done
     if test -n "$dir"; then
       
-  if test "$dir" != "/usr/lib"; then
+  if test "$dir" != "/usr/${ABILIB}"; then
     
   if test -z "$dir" || echo "$dir" | grep '^/' >/dev/null ; then
     ai_p=$dir
@@ -66540,7 +66549,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "YAZ_SHARED_LIBADD"; then
-      YAZ_SHARED_LIBADD="-R$dir -L$dir $YAZ_SHARED_LIBADD"
+      YAZ_SHARED_LIBADD="-L$dir $YAZ_SHARED_LIBADD"
     else
       
   
@@ -67377,7 +67386,7 @@
     { echo "configure: error: Cannot find libzzip" 1>&2; exit 1; }
   fi
 
-  ZZIPLIB_LIBDIR=$ZZIPLIB_DIR/lib
+  ZZIPLIB_LIBDIR=$ZZIPLIB_DIR/${ABILIB}
 
   
   old_LDFLAGS=$LDFLAGS
@@ -67440,7 +67449,7 @@
     ZIP_SHARED_LIBADD="-lzzip $ZIP_SHARED_LIBADD"
     if test -n "$ZZIPLIB_LIBDIR"; then
       
-  if test "$ZZIPLIB_LIBDIR" != "/usr/lib"; then
+  if test "$ZZIPLIB_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$ZZIPLIB_LIBDIR" || echo "$ZZIPLIB_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ZZIPLIB_LIBDIR
@@ -67453,7 +67462,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n "ZIP_SHARED_LIBADD"; then
-      ZIP_SHARED_LIBADD="-R$ZZIPLIB_LIBDIR -L$ZZIPLIB_LIBDIR $ZIP_SHARED_LIBADD"
+      ZIP_SHARED_LIBADD="-L$ZZIPLIB_LIBDIR $ZIP_SHARED_LIBADD"
     else
       
   
@@ -67478,7 +67487,7 @@
 
   if test -n "$ZZIPLIB_LIBDIR"; then
     
-  if test "$ZZIPLIB_LIBDIR" != "/usr/lib"; then
+  if test "$ZZIPLIB_LIBDIR" != "/usr/${ABILIB}"; then
     
   if test -z "$ZZIPLIB_LIBDIR" || echo "$ZZIPLIB_LIBDIR" | grep '^/' >/dev/null ; then
     ai_p=$ZZIPLIB_LIBDIR
@@ -67491,7 +67500,7 @@
   fi
 
     if test "$ext_shared" = "yes" && test -n ""; then
-      ="-R$ZZIPLIB_LIBDIR -L$ZZIPLIB_LIBDIR $"
+      ="-L$ZZIPLIB_LIBDIR $"
     else
       
   
@@ -67786,6 +67795,10 @@
 
 
 
+echo "\n\nspc EXTRA_LIBS tests\n"
+echo $EXTRA_LIBS | awk '{printf "EXTRA_LIBS: \"%s\"\n", $0}'
+echo $DLIBS | awk '{printf "DLIBS: \"%s\"\n", $0}'
+echo $LIBS | awk '{printf "LIBS: \"%s\"\n", $0}'
 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS"
 unset LIBS LDFLAGS
 
@@ -68074,7 +68087,7 @@
     lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
     ;;
   *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+    lt_cv_file_magic_test_file='/usr/${ABILIB}/libSystem.dylib'
     ;;
   esac
   ;;
@@ -68087,7 +68100,7 @@
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      lt_cv_file_magic_test_file=`echo /usr/${ABILIB}/libc.so.*`
       ;;
     esac
   else
@@ -68102,7 +68115,7 @@
 hpux10.20*|hpux11*)
   lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+  lt_cv_file_magic_test_file=/usr/${ABILIB}/libc.sl
   ;;
 
 irix5* | irix6*)
@@ -68135,14 +68148,14 @@
     # glibc up to 2.1.1 does not perform some relocations on ARM
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  lt_cv_file_magic_test_file=`echo /${ABILIB}/libc.so* /${ABILIB}/libc-*.so`
   ;;
 
 netbsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+    lt_cv_deplibs_check_method='match_pattern /${ABILIB}[^/\.]+\.so\.[0-9]+\.[0-9]+$'
   else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
+    lt_cv_deplibs_check_method='match_pattern /${ABILIB}[^/\.]+\.so$'
   fi
   ;;
 
@@ -68149,12 +68162,12 @@
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  lt_cv_file_magic_test_file=/usr/${ABILIB}/libnls.so
   ;;
 
 openbsd*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  lt_cv_file_magic_test_file=`echo /usr/${ABILIB}/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
   else
@@ -68175,7 +68188,7 @@
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
+  lt_cv_file_magic_test_file=/${ABILIB}/libc.so
   ;;
 
 sysv5uw[78]* | sysv4*uw2*)
@@ -68186,7 +68199,7 @@
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    lt_cv_file_magic_test_file=`echo /usr/${ABILIB}/libc.so*`
     ;;
   ncr)
     lt_cv_deplibs_check_method=pass_all
@@ -68198,7 +68211,7 @@
   sni)
     lt_cv_file_magic_cmd='/bin/file'
     lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
+    lt_cv_file_magic_test_file=/${ABILIB}/libc.so
     ;;
   esac
   ;;
@@ -69039,7 +69052,7 @@
 	# AIX 5 now supports IA64 processor
 	lt_cv_prog_cc_static='-Bstatic'
       else
-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+	lt_cv_prog_cc_static='-bnso -bI:/${ABILIB}/syscalls.exp'
       fi
       ;;
 
@@ -69730,15 +69743,15 @@
       # Warning - without using the other runtime loading flags (-brtl),
       # -berok will link without error, but may produce a broken library.
       allow_undefined_flag='-berok'
-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/${ABILIB}:/${ABILIB}'
       archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
     else
       if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/${ABILIB}:/${ABILIB}'
 	allow_undefined_flag="-z nodefs"
 	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
       else
-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/${ABILIB}:/${ABILIB}'
 	# Warning - without using the other run time loading flags,
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='${wl}-berok'
@@ -69804,7 +69817,7 @@
   # does not break anything, and helps significantly (at the cost of a little
   # extra space).
   freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/${ABILIB}/c++rt0.o'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
@@ -69918,7 +69931,7 @@
     else
       allow_undefined_flag=' -expect_unresolved \*'
       archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $${ABILIB}.exp; echo "\$i" >> $${ABILIB}.exp; done; echo "-hidden">> $${ABILIB}.exp~
       $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 
       #Both c and cxx compiler support -rpath directly
@@ -70130,8 +70143,8 @@
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+sys_lib_dlsearch_path_spec="/${ABILIB} /usr/${ABILIB}"
+sys_lib_search_path_spec="/${ABILIB} /usr/${ABILIB} /usr/local/${ABILIB}"
 
 case $host_os in
 aix3*)
@@ -70204,11 +70217,11 @@
   soname_spec='${libname}${release}.so$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  sys_lib_search_path_spec="/shlib /usr/${ABILIB} /usr/X11/${ABILIB} /usr/contrib/${ABILIB} /${ABILIB} /usr/local/${ABILIB}"
+  sys_lib_dlsearch_path_spec="/shlib /usr/${ABILIB} /usr/local/${ABILIB}"
   export_dynamic_flag_spec=-rdynamic
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # the default ld.so.conf also contains /usr/contrib/${ABILIB} and
+  # /usr/X11R6/${ABILIB} (/usr/X11 is a link to /usr/X11R6), but let us allow
   # libtool to hard-code these into programs
   ;;
 
@@ -70358,7 +70371,7 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # We used to test for /${ABILIB}/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
   # most powerpc-linux boxes support dynamic linking these days and
@@ -70427,7 +70440,7 @@
   soname_spec='${libname}${release}.so'
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
   shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/${ABILIB} /usr/${ABILIB}/cmplrs/cc /usr/${ABILIB} /usr/local/${ABILIB} /var/shlib"
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
@@ -70476,7 +70489,7 @@
       need_lib_prefix=no
       need_version=no
       shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      sys_lib_search_path_spec='/${ABILIB} /usr/${ABILIB} /usr/ccs/${ABILIB}'
       ;;
   esac
   ;;
@@ -72970,7 +72983,7 @@
   
   if test -r "$TSRM_ST/include/st.h"; then
     CPPFLAGS="$CPPFLAGS -I$TSRM_ST/include"
-    LDFLAGS="$LDFLAGS -L$TSRM_ST/lib"
+    LDFLAGS="$LDFLAGS -L$TSRM_ST/${ABILIB}"
   elif test -r "$TSRM_ST/st.h"; then
     CPPFLAGS="$CPPFLAGS -I$TSRM_ST"
     LDFLAGS="$LDFLAGS -L$TSRM_ST"
@@ -73232,15 +73245,12 @@
 
 
 fi
-EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"
-EXTRA_LIBS="$EXTRA_LIBS $LIBS"
-unset LIBS LDFLAGS
 
 test "$prefix" = "NONE" && prefix=/usr/local
 test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
 
 case $libdir in
-  '${exec_prefix}/lib')
+  '${exec_prefix}/${ABILIB}')
     libdir=$libdir/php
     ;;
 esac
@@ -73327,12 +73337,13 @@
     done
   fi
 
+echo $PHP_LDFLAGS | awk '{printf "PHP_LDFLAGS: \"%s\"\n", $0}'
 
 
   unset ac_new_flags
   for i in $PHP_LDFLAGS; do
     case $i in
-    -L/usr/lib|-L/usr/lib/) ;;
+    -L/usr/${ABILIB}|-L/usr/${ABILIB}/) ;;
     *) ac_new_flags="$ac_new_flags $i" ;;
     esac
   done
@@ -73342,7 +73353,7 @@
   unset ac_new_flags
   for i in $LDFLAGS; do
     case $i in
-    -L/usr/lib|-L/usr/lib/) ;;
+    -L/usr/${ABILIB}|-L/usr/${ABILIB}/) ;;
     *) ac_new_flags="$ac_new_flags $i" ;;
     esac
   done
@@ -73350,6 +73361,54 @@
 
 
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
+
+#
+# Here's where SGI fixes all the "wrong" variables in order to get
+#  things to work properly with other freeware libraries.
+#  There are some serious issues with the PHP configure file,
+#  but no answer from the PHP wizards like Rasmus regarding
+#  helping them clean it up.
+#
+# These variable choices might *NOT* work with gcc.  Try commenting
+#  out the entire section between this block of comments and the
+#  comment line "End of SGI fixes" below.
+#
+
+test "$EXTRA_LDFLAGS" && \
+  EXTRA_LDFLAGS=""
+test "$EXTRA_LIBS" && \
+  EXTRA_LIBS="-lm"
+test "$PHP_LDFLAGS" && \
+  PHP_LDFLAGS=""
+test "$PHP_RPATHS" && \
+  PHP_RPATHS=""
+test "$ZEND_EXTRA_LIBS" && \
+  ZEND_EXTRA_LIBS=""
+test "$ZLIB_SHARED_LIBADD" && \
+  ZLIB_SHARED_LIBADD="-lz"
+test "$GD_SHARED_LIBADD" && \
+  GD_SHARED_LIBADD="-lgd -lm"
+test "$GETTEXT_SHARED_LIBADD" && \
+  GETTEXT_SHARED_LIBADD="-lintl"
+test "$IMAP_SHARED_LIBADD" && \
+  IMAP_SHARED_LIBADD="-lcrypto -lssl -lc-client"
+test "$LDAP_SHARED_LIBADD" && \
+  LDAP_SHARED_LIBADD="-lldap -llber"
+test "$PDFLIB_SHARED_LIBADD" && \
+  PDFLIB_SHARED_LIBADD="-lpdf -lz -ltiff -lpng -ljpeg"
+test "$PGSQL_SHARED_LIBADD" && \
+  PGSQL_SHARED_LIBADD="-lpq"
+test "$PSPELL_SHARED_LIBADD" && \
+  PSPELL_SHARED_LIBADD="-lpspell"
+test "$EXPAT_SHARED_LIBADD" && \
+  EXPAT_SHARED_LIBADD="-lexpat"
+test "$XSLT_SHARED_LIBADD" && \
+  XSLT_SHARED_LIBADD="-lsablot -lexpat"
+OPENSSL_SHARED_LIBADD="-lssl -lcrypto"
+
+#
+# End of SGI fixes.
+#
 
 PHP_BUILD_DATE=`date '+%Y-%m-%d'`
 cat >> confdefs.h <<EOF
--- ./ltmain.sh	Thu Sep  5 16:40:44 2002
+++ ../php-4.2.3/./ltmain.sh	Tue Dec 31 12:30:40 2002
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"
 
@@ -1598,6 +1598,14 @@
 	else
 	  dir="$ladir/$objdir"
 	  absdir="$abs_ladir/$objdir"
+#sgi added to work around .la file installed with the .so in the same
+#sgi       directory; assumes that the library is in the directory
+#sgi       $abs_ladir if not in $abs_ladir/$objdir/.
+          if test ! -f $absdir/$linklib; then
+            dir="$ladir"
+            absdir="$abs_ladir"
+          fi
+#end sgi
 	  # Remove this search path later
 	  notinst_path="$notinst_path $abs_ladir"
 	fi # $installed = yes
--- ./ext/gettext/gettext.c	Sat Dec 15 06:22:59 2001
+++ ../php-4.2.3/./ext/gettext/gettext.c	Tue Dec 31 14:15:27 2002
@@ -27,7 +27,7 @@
 #include "php_gettext.h"
 
 #if HAVE_LIBINTL
-
+#define _INTL_REDIRECT_INLINE 1
 #include <libintl.h>
 #include "ext/standard/info.h"
 
--- ./ext/openssl/Makefile.in	Mon Nov 13 11:47:19 2000
+++ ../php-4.2.3/./ext/openssl/Makefile.in	Tue Dec 31 12:30:40 2002
@@ -3,5 +3,6 @@
 LTLIBRARY_NAME        = libopenssl.la
 LTLIBRARY_SOURCES     = openssl.c
 LTLIBRARY_SHARED_NAME = openssl.la
+LTLIBRARY_SHARED_LIBADD = $(OPENSSL_SHARED_LIBADD)
 
 include $(top_srcdir)/build/dynlib.mk