Index: ossp-pkg/str/aclocal.m4
RCS File: /v/ossp/cvs/ossp-pkg/str/aclocal.m4,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/str/aclocal.m4,v' 2>/dev/null
--- aclocal.m4	2001/09/13 13:57:38	1.4
+++ aclocal.m4	2002/03/14 15:49:51	1.5
@@ -31,7 +31,6 @@
 dnl ##
 
 AC_DEFUN(AC_HEADLINE,[dnl
-AC_DIVERT_PUSH(NOTICE)dnl
 #   configuration header
 if test ".`echo dummy [$]@ | grep help`" = .; then
     #   bootstrapping shtool
@@ -60,7 +59,6 @@
     $3_HEX="`$ac_shtool version -l c -d hex $ac_srcdir/$4`"
     AC_SUBST($3_HEX)
 fi
-AC_DIVERT_POP()
 ])dnl
 
 dnl ##
@@ -125,7 +123,7 @@
     esac
 fi
 msg="enabled"
-AC_DEFINE(STR_DEBUG)
+AC_DEFINE(STR_DEBUG, 1, [Define to 1 if you want to enable debugging])
 ],[
 if test ".$ac_cv_prog_gcc" = ".yes"; then
 case "$CFLAGS" in
@@ -189,7 +187,6 @@
 fi
 ])
 
-
 dnl ##
 dnl ##  Check for an external/extension library.
 dnl ##  - is aware of <libname>-config style scripts
@@ -208,10 +205,10 @@
 dnl ##
 
 AC_DEFUN(AC_CHECK_EXTLIB,[dnl
-AC_ARG_WITH($2,dnl
-[  --with-]substr([$2[[=DIR]]                 ], 0, 19)[build against $1 library (default=no)],
+AC_ARG_WITH($2, [dnl
+[  --with-]m4_substr([$2[[=DIR]]                     ], 0, 19)[build with external $1 library (default=no)]], [dnl
     if test ".$with_$2" = .yes; then
-        #   via config script
+        #   via config script in PATH
         $2_version=`($2-config --version) 2>/dev/null`
         if test ".$$2_version" != .; then
             CPPFLAGS="$CPPFLAGS `$2-config --cflags`"
@@ -223,7 +220,7 @@
             found=0
             #   via config script
             for dir in $with_$2/bin $with_$2; do
-                if test -f "$dir/$2-config"; then
+                if test -f "$dir/$2-config" && test ! -f "$dir/$2-config.in"; then
                     $2_version=`($dir/$2-config --version) 2>/dev/null`
                     if test ".$$2_version" != .; then
                         CPPFLAGS="$CPPFLAGS `$dir/$2-config --cflags`"
@@ -234,7 +231,7 @@
                     fi
                 fi
             done
-            #   via standard paths
+            #   in standard sub-areas
             if test ".$found" = .0; then
                 for dir in $with_$2/include/$2 $with_$2/include $with_$2; do
                     if test -f "$dir/$4"; then
@@ -245,25 +242,29 @@
                     fi
                 done
                 for dir in $with_$2/lib/$2 $with_$2/lib $with_$2; do
-                    if test -f "$dir/lib$2.a" -o -f "$dir/lib$2.so"; then
+                    if test -f "$dir/lib$2.la" && test -d "$dir/.libs"; then
+                        LDFLAGS="$LDFLAGS -L$dir -L$dir/.libs"
+                        found=1
+                        break
+                    elif test -f "$dir/lib$2.a" || test -f "$dir/lib$2.so"; then
                         LDFLAGS="$LDFLAGS -L$dir"
                         found=1
                         break
                     fi
                 done
             fi
-            #   in any subarea
+            #   in any sub-area
             if test ".$found" = .0; then
 changequote(, )dnl
                 for file in x `find $with_$2 -name "$4" -type f -print`; do
                     test .$file = .x && continue
-                    dir=`echo $file | sed -e 's;[[^/]]*$;;' -e 's;\(.\)/$;\1;'`
+                    dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
                     CPPFLAGS="$CPPFLAGS -I$dir"
                     CFLAGS="$CFLAGS -I$dir"
                 done
-                for file in x `find $with_$2 -name "lib$2.[[aso]]" -type f -print`; do
+                for file in x `find $with_$2 -name "lib$2.[aso]" -type f -print`; do
                     test .$file = .x && continue
-                    dir=`echo $file | sed -e 's;[[^/]]*$;;' -e 's;\(.\)/$;\1;'`
+                    dir=`echo $file | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'`
                     LDFLAGS="$LDFLAGS -L$dir"
                 done
 changequote([, ])dnl
@@ -272,16 +273,24 @@
     fi
     AC_HAVE_HEADERS($4)
     AC_CHECK_LIB($2, $3)
-    AC_IFALLYES(header:$4 lib:$2_$3, with_$2=yes, with_$2=no)
+    with_$2=yes
+    ac_var="ac_cv_header_`echo $4 | sed 'y%./+-%__p_%'`"
+    eval "ac_val=\$$ac_var"
+    if test ".$ac_val" != .yes; then
+        with_$2=no
+    fi
+    if test ".$ac_cv_lib_$2_$3" != .yes; then
+        with_$2=no
+    fi
     if test ".$with_$2" = .no; then
         AC_ERROR([Unable to find $1 library])
     fi
-,
+    ], [dnl
 if test ".$with_$2" = .; then
     with_$2=no
 fi
-)dnl
-AC_MSG_CHECKING(whether to build against $1 library)
+    ])dnl
+AC_MSG_CHECKING(whether to build against external $1 library)
 if test ".$with_$2" = .yes; then
     ifelse([$5], , :, [$5])
 else
@@ -289,4 +298,3 @@
 fi
 AC_MSG_RESULT([$with_$2])
 ])dnl
-
Index: ossp-pkg/str/configure.ac
RCS File: /v/ossp/cvs/ossp-pkg/str/configure.ac,v
rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/str/configure.ac,v' 2>/dev/null
--- configure.ac	2002/01/02 17:09:13	1.8
+++ configure.ac	2002/03/14 15:49:51	1.9
@@ -2,20 +2,16 @@
 dnl ##   Autoconf specification for STR library
 dnl ##
 
-AC_PREREQ(2.52)dnl
-AC_REVISION(1.0)
-
-AC_INIT(README)
+AC_PREREQ(2.53)
+AC_INIT
 AC_HEADLINE(dnl
-OSSP Str, String Library, dnl
+OSSP str, String Library, dnl
 STR_VERSION, str_version.c, dnl
 [Copyright (c) 1999-2002 The OSSP Project <http://www.ossp.org>
 Copyright (c) 1999-2002 Ralf S. Engelschall <rse@engelschall.com>])
-AC_CONFIG_HEADER(str_config.h)
-AC_PREFIX_DEFAULT(/usr/local)
 AC_PLATFORM(PLATFORM)
 
-AC_SET_MAKE
+AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_CPP
 AC_CHECK_DEBUGGING
@@ -35,13 +31,11 @@
 
 AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
 
-AC_CHECK_EXTLIB([Dmalloc], dmalloc, dmalloc_debug, dmalloc.h, AC_DEFINE(WITH_DMALLOC))
+AC_CHECK_EXTLIB([Dmalloc], dmalloc, dmalloc_debug, dmalloc.h, 
+                [AC_DEFINE(WITH_DMALLOC, 1, [Define to 1 if building with Dmalloc])])
 
-AC_OUTPUT(dnl
-Makefile dnl
-str.h dnl
-str-config dnl
-,dnl
-chmod a+x str-config
-)dnl
+AC_CONFIG_HEADERS(str_config.h)
+AC_CONFIG_FILES([Makefile str.h str-config])
+AC_CONFIG_COMMANDS([adjustment], [chmod a+x str-config])
+AC_OUTPUT
 
Index: ossp-pkg/str/devtool.conf
RCS File: /v/ossp/cvs/ossp-pkg/str/devtool.conf,v
rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/str/devtool.conf,v' 2>/dev/null
--- devtool.conf	2001/12/27 12:15:19	1.1
+++ devtool.conf	2002/03/14 15:49:51	1.2
@@ -3,9 +3,9 @@
 ##
 
 %autogen
-    @autogen shtool   1.5.4 "1.5.*" echo install mkdir fixperm tarball version
+    @autogen shtool   1.6.0 "1.6.*" echo install mkdir fixperm tarball version
     @autogen libtool  1.4.2 "1.4*"
-    @autogen autoconf 2.52  "2.5.*"
+    @autogen autoconf 2.53  "2.5[3-9]*"
 
 %autoclean
     @autoclean shtool
@@ -20,7 +20,7 @@
         "$@"
 
 %version
-    ./shtool version -l c -n "OSSP Str" -p "str_" -e str_version.c
+    ./shtool version -l c -n "OSSP str" -p "str_" -e str_version.c
 
 %dist
     make distclean >/dev/null 2>&1
Index: ossp-pkg/str/devtool.func
RCS File: /v/ossp/cvs/ossp-pkg/str/devtool.func,v
rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/str/devtool.func,v' 2>/dev/null
--- devtool.func	2002/01/02 17:09:13	1.2
+++ devtool.func	2002/03/14 15:49:51	1.3
@@ -33,6 +33,7 @@
             echo "generating (GNU Autoconf $autoconf_version): configure config.h.in"
             autoconf
             autoheader 2>&1 | grep -v "is unchanged"
+            rm -rf autom4te.cache >/dev/null 2>&1
             ;;
         libtool )
             libtoolize_version=`devtool_require libtoolize --version 4 "$1" "$2"`