]> ncurses.scripts.mit.edu Git - ncurses.git/blobdiff - aclocal.m4
ncurses 5.6 - patch 20080913
[ncurses.git] / aclocal.m4
index dfe38668ac4fbeddfa29b6019f94ed47ae9b7cef..e526bd1a3f3834e386cfe6cd4f660b21dbb561ac 100644 (file)
@@ -1,5 +1,5 @@
 dnl***************************************************************************
-dnl Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.442 2007/12/01 20:02:42 tom Exp $
+dnl $Id: aclocal.m4,v 1.463 2008/09/13 16:54:28 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -168,7 +168,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_INCDIR version: 8 updated: 2007/07/30 19:22:58
+dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
@@ -210,7 +210,7 @@ if test -n "$1" ; then
                fi
 
                if test "$cf_have_incdir" = no ; then
-                 AC_VERBOSE(adding $cf_add_incdir to include-path)
+                 CF_VERBOSE(adding $cf_add_incdir to include-path)
                  ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
 
           cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
@@ -225,7 +225,7 @@ if test -n "$1" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBDIR version: 5 updated: 2007/07/30 19:12:03
+dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34
 dnl -------------
 dnl    Adds to the library-path
 dnl
@@ -253,7 +253,7 @@ if test -n "$1" ; then
         done
       fi
       if test "$cf_have_libdir" = no ; then
-        AC_VERBOSE(adding $cf_add_libdir to library-path)
+        CF_VERBOSE(adding $cf_add_libdir to library-path)
         ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
       fi
     fi
@@ -313,7 +313,7 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_REQD version: 3 updated: 1997/09/06 13:40:44
+dnl CF_ANSI_CC_REQD version: 4 updated: 2008/03/23 14:48:54
 dnl ---------------
 dnl For programs that must use an ANSI compiler, obtain compiler options that
 dnl will make it recognize prototypes.  We'll do preprocessor checks in other
@@ -322,7 +322,7 @@ dnl the preprocessor.
 AC_DEFUN([CF_ANSI_CC_REQD],
 [AC_REQUIRE([CF_ANSI_CC_CHECK])
 if test "$cf_cv_ansi_cc" = "no"; then
-       AC_ERROR(
+       AC_MSG_ERROR(
 [Your compiler does not appear to recognize prototypes.
 You have the following choices:
        a. adjust your compiler options
@@ -331,6 +331,30 @@ You have the following choices:
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_AWK_BIG_PRINTF version: 1 updated: 2008/09/06 17:17:18
+dnl -----------------
+dnl Check if awk can handle big strings using printf.  Some older versions of
+dnl awk choke on large strings passed via "%s".
+dnl
+dnl $1 = desired string size
+dnl $2 = variable to set with result
+AC_DEFUN([CF_AWK_BIG_PRINTF],
+[
+    case x$AWK in #(vi
+    x)
+        eval $2=no
+        ;;
+    *) #(vi
+        if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
+            | $AWK '{ if (length([$]0) != $1) exit 1; }' 2>/dev/null >/dev/null ); then
+            eval $2=yes
+        else
+            eval $2=no
+        fi
+        ;;
+    esac
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
 dnl ------------
 dnl Test if 'bool' is a builtin type in the configured C++ compiler.  Some
@@ -614,7 +638,7 @@ AC_MSG_RESULT($cf_cv_cgetent)
 test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CACHE version: 10 updated: 2004/05/23 13:03:31
+dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -645,17 +669,18 @@ test -n "$cf_cv_system_name" && AC_MSG_RESULT(Configuring for $cf_cv_system_name
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
        AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name))
-       AC_ERROR("Please remove config.cache and try again.")
+       AC_MSG_ERROR("Please remove config.cache and try again.")
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_ERRNO version: 9 updated: 2001/12/30 18:03:23
+dnl CF_CHECK_ERRNO version: 10 updated: 2008/08/22 16:33:22
 dnl --------------
 dnl Check for data that is usually declared in <stdio.h> or <errno.h>, e.g.,
 dnl the 'errno' variable.  Define a DECL_xxx symbol if we must declare it
 dnl ourselves.
 dnl
 dnl $1 = the name to check
+dnl $2 = the assumed type
 AC_DEFUN([CF_CHECK_ERRNO],
 [
 AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
@@ -666,7 +691,7 @@ AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h> ],
-    [long x = (long) $1],
+    ifelse($2,,int,$2) x = (ifelse($2,,int,$2)) $1,
     [cf_cv_dcl_$1=yes],
     [cf_cv_dcl_$1=no])
 ])
@@ -677,7 +702,7 @@ if test "$cf_cv_dcl_$1" = no ; then
 fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
-CF_CHECK_EXTERN_DATA($1,int)
+CF_CHECK_EXTERN_DATA($1,ifelse($2,,int,$2))
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_CHECK_EXTERN_DATA version: 3 updated: 2001/12/30 18:03:23
@@ -920,6 +945,20 @@ if test "$with_no_leaks" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_ENABLE_RPATH version: 1 updated: 2008/09/13 10:22:30
+dnl ---------------
+dnl Check if the rpath option should be used, setting cache variable
+dnl cf_cv_ld_rpath if so.
+AC_DEFUN([CF_ENABLE_RPATH],
+[
+AC_MSG_CHECKING(if rpath option should be used)
+AC_ARG_ENABLE(rpath,
+[  --enable-rpath          use rpath option when generating shared libraries],
+[cf_cv_ld_rpath=$enableval],
+[cf_cv_ld_rpath=no])
+AC_MSG_RESULT($cf_cv_ld_rpath)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39
 dnl --------
 dnl Check if 'errno' is declared in <errno.h>
@@ -1058,6 +1097,34 @@ int main() {
 test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP)
 ])
 dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_OPENPTY version: 2 updated: 2008/04/12 19:49:01
+dnl ---------------
+dnl Check for openpty() function, along with <pty.h> header.  It may need the
+dnl "util" library as well.
+AC_DEFUN([CF_FUNC_OPENPTY],
+[
+AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
+AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
+    cf_save_LIBS="$LIBS"
+    test $cf_cv_lib_util = yes && LIBS="-lutil $LIBS"
+    for cf_header in pty.h libutil.h util.h
+    do
+    AC_TRY_LINK([
+#include <$cf_header>
+],[
+    int x = openpty((int *)0, (int *)0, (char *)0,
+                   (struct termios *)0, (struct winsize *)0);
+],[
+        cf_cv_func_openpty=$cf_header
+        break
+],[
+        cf_cv_func_openpty=no
+])
+    done
+    LIBS="$cf_save_LIBS"
+])
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30
 dnl ------------
 dnl See if the poll function really works.  Some platforms have poll(), but
@@ -1250,7 +1317,7 @@ if test "$GCC" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12
+dnl CF_GCC_WARNINGS version: 23 updated: 2008/07/26 17:54:02
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -1345,7 +1412,7 @@ then
                                ;;
                        Winline) #(vi
                                case $GCC_VERSION in
-                               3.3*)
+                               [[34]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
@@ -1687,7 +1754,7 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_HASHED_DB_LIBS version: 7 updated: 2007/12/01 15:01:37
+dnl CF_HASHED_DB_LIBS version: 8 updated: 2008/08/04 06:18:06
 dnl -----------------
 dnl Given that we have the header and version for hashed database, find the
 dnl library information.
@@ -1695,7 +1762,7 @@ AC_DEFUN([CF_HASHED_DB_LIBS],
 [
 AC_CACHE_CHECK(for db libraries, cf_cv_hashed_db_libs,[
 cf_cv_hashed_db_libs=unknown
-for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
+for cf_db_libs in "" db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
 do
        cf_save_libs="$LIBS"
        if test -n "$cf_db_libs"; then
@@ -1921,7 +1988,7 @@ ifdef([AC_FUNC_FSEEKO],[
 ])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_LDFLAGS_STATIC version: 2 updated: 2007/04/28 15:25:27
+dnl CF_LDFLAGS_STATIC version: 3 updated: 2008/07/05 13:56:40
 dnl -----------------
 dnl Check for compiler/linker flags used to temporarily force usage of static
 dnl libraries.  This depends on the compiler and platform.  Use this to help
@@ -1930,8 +1997,16 @@ dnl the list of linker options and libraries.
 AC_DEFUN([CF_LDFLAGS_STATIC],[
 
 if test "$GCC" = yes ; then
-       LDFLAGS_STATIC=-static
-       LDFLAGS_SHARED=-dynamic
+       case $cf_cv_system_name in #(
+       aix[[45]]*)     #( gcc 4.2.4 linkage on AIX is broken 
+               LDFLAGS_STATIC=
+               LDFLAGS_SHARED=
+               ;;
+    *)         #( normally, except when broken
+        LDFLAGS_STATIC=-static
+        LDFLAGS_SHARED=-dynamic
+        ;;
+    esac
 else
        case $cf_cv_system_name in #(
        aix[[45]]*)     #( from ld manpage
@@ -1984,22 +2059,24 @@ if test "$cf_cv_libutf8" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_PREFIX version: 7 updated: 2001/01/12 01:23:48
+dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
 dnl -------------
 dnl Compute the library-prefix for the given host system
 dnl $1 = variable to set
 AC_DEFUN([CF_LIB_PREFIX],
 [
-       case $cf_cv_system_name in
-       OS/2*)  LIB_PREFIX=''     ;;
-       os2*)   LIB_PREFIX=''     ;;
-       *)      LIB_PREFIX='lib'  ;;
+       case $cf_cv_system_name in #(vi
+       OS/2*|os2*) #(vi
+        LIB_PREFIX=''
+        ;;
+       *)      LIB_PREFIX='lib'
+        ;;
        esac
 ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 50 updated: 2007/03/24 18:26:59
+dnl CF_LIB_RULES version: 51 updated: 2008/09/13 11:34:16
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -2026,7 +2103,7 @@ do
                LIBS_TO_MAKE=
                for cf_item in $cf_LIST_MODELS
                do
-                       CF_LIB_SUFFIX($cf_item,cf_suffix)
+                       CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
                        if test $cf_item = shared ; then
                        if test "$cf_cv_do_symlinks" = yes ; then
                                case "$cf_cv_shlib_version" in #(vi
@@ -2120,7 +2197,7 @@ do
                        do
                        echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
                        CF_UPPER(cf_ITEM,$cf_item)
-                       CF_LIB_SUFFIX($cf_item,cf_suffix)
+                       CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
                        CF_OBJ_SUBDIR($cf_item,cf_subdir)
 
                        # Test for case where we build libtinfo with a different name.
@@ -2452,34 +2529,62 @@ fi
 ])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_SUFFIX version: 13 updated: 2003/11/01 16:09:07
+dnl CF_LIB_SUFFIX version: 15 updated: 2008/09/13 11:54:48
 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name
-dnl $2 = variable to set
+dnl $2 = variable to set (the nominal library suffix)
+dnl $3 = dependency variable to set (actual filename)
 dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
 AC_DEFUN([CF_LIB_SUFFIX],
 [
        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
        case $1 in
-       libtool) $2='.la'  ;;
-       normal)  $2='.a'   ;;
-       debug)   $2='_g.a' ;;
-       profile) $2='_p.a' ;;
+       libtool)
+               $2='.la'
+               $3=[$]$2
+               ;;
+       normal)
+               $2='.a'
+               $3=[$]$2
+               ;;
+       debug)
+               $2='_g.a'
+               $3=[$]$2
+               ;;
+       profile)
+               $2='_p.a'
+               $3=[$]$2
+               ;;
        shared)
                case $cf_cv_system_name in
-               cygwin*) $2='.dll' ;;
-               darwin*) $2='.dylib' ;;
+               cygwin*)
+                       $2='.dll'
+                       $3='.dll.a'
+                       ;;
+               darwin*)
+                       $2='.dylib'
+                       $3=[$]$2
+                       ;;
                hpux*)
                        case $target in
-                       ia64*)  $2='.so' ;;
-                       *)      $2='.sl' ;;
+                       ia64*)
+                               $2='.so'
+                               $3=[$]$2
+                               ;;
+                       *)
+                               $2='.sl'
+                               $3=[$]$2
+                               ;;
                        esac
                        ;;
-               *)      $2='.so'  ;;
+               *)      $2='.so'
+                       $3=[$]$2
+                       ;;
                esac
        esac
        test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+       test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}"
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_LIB_TYPE version: 4 updated: 2000/10/20 22:57:49
@@ -3445,7 +3550,7 @@ ifelse($1,,,[$1=$PATHSEP])
        AC_SUBST(PATHSEP)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 11 updated: 2006/09/02 08:55:46
+dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -3477,7 +3582,7 @@ case ".[$]$1" in #(vi
   $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2)
+  ifelse($2,,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
   ;;
 esac
 ])dnl
@@ -3841,7 +3946,7 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK version: 3 updated: 2007/12/01 11:14:13
+dnl CF_RPATH_HACK version: 4 updated: 2008/09/13 12:53:26
 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],
 [
@@ -3853,48 +3958,46 @@ CF_VERBOSE(...checking LDFLAGS $LDFLAGS)
 CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
 case "$EXTRA_LDFLAGS" in #(vi
 -Wl,-rpath,*) #(vi
-    cf_rpath_hack="-Wl,-rpath,"
-    ;;
+       cf_rpath_hack="-Wl,-rpath,"
+       ;;
 -R\ *)
-    cf_rpath_hack="-R "
-    ;;
+       cf_rpath_hack="-R "
+       ;;
 -R*)
-    cf_rpath_hack="-R"
-    ;;
+       cf_rpath_hack="-R"
+       ;;
 *)
-    cf_rpath_hack=
-    ;;
+       cf_rpath_hack=
+       ;;
 esac
 if test -n "$cf_rpath_hack" ; then
-    cf_rpath_dst=
-    for cf_rpath_src in $LDFLAGS
-    do
-        CF_VERBOSE(Filtering $cf_rpath_src)
-        case $cf_rpath_src in #(vi
-        -L*) #(vi
-            if test "$cf_rpath_hack" = "-R " ; then
-                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
-            else
-                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
-            fi
-            CF_VERBOSE(...Filter $cf_rpath_tmp)
-            EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
-            ;;
-        *)
-            cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-            ;;
-        esac
-    done
-    LDFLAGS=$cf_rpath_dst
-    CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
-    CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+       cf_rpath_dst=
+       for cf_rpath_src in $LDFLAGS
+       do
+               CF_VERBOSE(Filtering $cf_rpath_src)
+               case $cf_rpath_src in #(vi
+               -L*) #(vi
+                       if test "$cf_rpath_hack" = "-R " ; then
+                               cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
+                       else
+                               cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
+                       fi
+                       CF_VERBOSE(...Filter $cf_rpath_tmp)
+                       EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+                       ;;
+               esac
+               cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+       done
+       LDFLAGS=$cf_rpath_dst
+       CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
+       CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
 fi
 else
 AC_MSG_RESULT(no)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 46 updated: 2007/02/24 18:58:09
+dnl CF_SHARED_OPTS version: 52 updated: 2008/09/13 11:54:48
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -3940,7 +4043,7 @@ AC_DEFUN([CF_SHARED_OPTS],
                cf_cv_shlib_version=$withval
                ;;
        *)
-               AC_ERROR([option value must be one of: rel, abi, auto or no])
+               AC_MSG_ERROR([option value must be one of: rel, abi, auto or no])
                ;;
        esac
        ],[cf_cv_shlib_version=auto])
@@ -4029,8 +4132,10 @@ CF_EOF
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
+                       MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
+               else
+                       MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $[@]` -o $[@]'
                fi
-               MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
                cf_cv_rm_so_locs=yes
                ;;
        linux*|gnu*|k*bsd*-gnu)
@@ -4043,11 +4148,20 @@ CF_EOF
                        EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        openbsd[[2-9]].*)
+               if test "$DFT_LWR_MODEL" = "shared" ; then
+                       LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+                       LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+               fi
+               if test "$cf_cv_ld_rpath" = yes ; then
+                       cf_ld_rpath_opt="-Wl,-rpath,"
+                       EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+               fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-               MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $[@].${ABI_VERSION}` -o $[@]'
+               CF_SHARED_SONAME
+               MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        openbsd*|freebsd[[12]].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -4080,7 +4194,7 @@ CF_EOF
                        fi
                        fi
                        CF_SHARED_SONAME
-                       MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
                else
                        MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
                fi
@@ -4130,9 +4244,7 @@ CF_EOF
                ;;
        solaris2*)
                # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
-               if test "$GCC" != yes; then
-                       CC_SHARED_OPTS='-KPIC'
-               fi
+               # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
                if test "$DFT_LWR_MODEL" = "shared" ; then
                        LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
@@ -4142,7 +4254,12 @@ CF_EOF
                        EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]'
+               if test "$GCC" != yes; then
+                       CC_SHARED_OPTS='-xcode=pic32'
+                       MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+               else
+                       MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+               fi
                ;;
        sysv5uw7*|unix_sv*)
                # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
@@ -4193,9 +4310,9 @@ CF_EOF
        AC_SUBST(INSTALL_LIB)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_SONAME version: 2 updated: 2006/10/21 12:33:41
+dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
 dnl ----------------
-dnl utility macro for CF_SHARED_OPTS, constructs "$cf_shared_soname" for
+dnl utility macro for CF_SHARED_OPTS, constructs "$cf_cv_shared_soname" for
 dnl substitution into MK_SHARED_LIB string for the "-soname" (or similar)
 dnl option.
 dnl
@@ -4205,9 +4322,9 @@ define([CF_SHARED_SONAME],
 [
        test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=ifelse($1,,rel,$1)
        if test "$cf_cv_shlib_version" = rel; then
-               cf_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}'
+               cf_cv_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}'
        else
-               cf_shared_soname='`basename $[@]`'
+               cf_cv_shared_soname='`basename $[@]`'
        fi
 ])
 dnl ---------------------------------------------------------------------------
@@ -4823,6 +4940,32 @@ fi
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WEAK_SYMBOLS version: 1 updated: 2008/08/16 19:18:06
+dnl ---------------
+dnl Check for compiler-support for weak symbols.
+dnl This works with "recent" gcc.
+AC_DEFUN([CF_WEAK_SYMBOLS],[
+AC_CACHE_CHECK(if $CC supports weak symbols,cf_cv_weak_symbols,[
+
+AC_TRY_COMPILE([
+#include <stdio.h>],
+[
+#if defined(__GNUC__)
+#  if defined __USE_ISOC99
+#    define _cat_pragma(exp)   _Pragma(#exp)
+#    define _weak_pragma(exp)  _cat_pragma(weak name)
+#  else
+#    define _weak_pragma(exp)
+#  endif
+#  define _declare(name)       __extension__ extern __typeof__(name) name
+#  define weak_symbol(name)    _weak_pragma(name) _declare(name) __attribute__((weak))
+#endif
+
+weak_symbol(fopen);
+],[cf_cv_weak_symbols=yes],[cf_cv_weak_symbols=no])
+])
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_WITH_ABI_VERSION version: 1 updated: 2003/09/20 18:12:49
 dnl -------------------
 dnl Allow library's ABI to be overridden.  Generally this happens when a
@@ -4873,7 +5016,7 @@ if test "$with_dmalloc" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_GPM version: 6 updated: 2006/12/17 11:12:09
+dnl CF_WITH_GPM version: 7 updated: 2008/03/23 14:48:54
 dnl -----------
 dnl
 dnl The option parameter (if neither yes/no) is assumed to be the name of
@@ -4895,7 +5038,7 @@ if test "$with_gpm" != no ; then
                        AC_DEFINE(HAVE_LIBGPM)
                else
                        AC_CHECK_LIB(gpm,Gpm_Open,[:],[
-                               AC_ERROR(Cannot link with GPM library)
+                               AC_MSG_ERROR(Cannot link with GPM library)
                fi
                with_gpm=yes
                ])
@@ -4906,7 +5049,7 @@ if test "$with_gpm" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL version: 18 updated: 2007/04/08 20:02:38
+dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
 dnl ---------------
 dnl Provide a configure option to incorporate libtool.  Define several useful
 dnl symbols for the makefile rules.
@@ -5007,6 +5150,7 @@ ifdef([AC_PROG_LIBTOOL],[
        case $cf_cv_libtool_version in
        1.[[5-9]]*|[[2-9]]*)
                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
+               LIBTOOL="$LIBTOOL --tag=CC"
                ;;
        *)
                LIBTOOL_CXX="$LIBTOOL"
@@ -5099,6 +5243,43 @@ AC_SUBST($3)dnl
 
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_WITH_PTHREAD version: 2 updated: 2008/08/23 18:26:05
+dnl ---------------
+dnl Check for POSIX thread library.
+AC_DEFUN([CF_WITH_PTHREAD],
+[
+AC_MSG_CHECKING(if you want to link with the pthread library)
+AC_ARG_WITH(pthread,
+    [  --with-pthread          use POSIX thread library],
+    [with_pthread=$withval],
+    [with_pthread=no])
+AC_MSG_RESULT($with_pthread)
+
+if test "$with_pthread" != no ; then
+    AC_CHECK_HEADER(pthread.h,[
+        AC_DEFINE(HAVE_PTHREADS_H)
+
+        AC_MSG_CHECKING(if we can link with the pthread library)
+        cf_save_LIBS="$LIBS"
+        LIBS="-lpthread $LIBS"
+        AC_TRY_LINK([
+#include <pthread.h>
+],[
+        int rc = pthread_create(0,0,0,0);
+],[with_pthread=yes],[with_pthread=no])
+        LIBS="$cf_save_LIBS"
+        AC_MSG_RESULT($with_pthread)
+
+        if test "$with_pthread" = yes ; then
+            LIBS="-lpthread $LIBS"
+            AC_DEFINE(HAVE_LIBPTHREADS)
+        else
+            AC_MSG_ERROR(Cannot link with pthread library)
+        fi
+    ])
+fi
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49
 dnl -------------------
 dnl Allow library's release-version to be overridden.  Generally this happens when a
@@ -5162,7 +5343,7 @@ CF_NO_LEAKS_OPTION(valgrind,
        [USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
+dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -5182,7 +5363,7 @@ case $host_os in #(vi
 aix[[45]]*) #(vi
        CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
        ;;
-freebsd*) #(vi
+freebsd*|dragonfly*) #(vi
        # 5.x headers associate
        #       _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L