ncurses 5.7 - patch 20100515

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 22d32d501f6756ca27b78583a0061b76d0f8c7eb..f66d27849d2c4f498e34ad78eab27df43c412984 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************

-dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+dnl Copyright (c) 1998-2009,2010 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            *
 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
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: aclocal.m4,v 1.475 2008/12/13 21:19:44 tom Exp $
+dnl $Id: aclocal.m4,v 1.519 2010/05/15 20:06:22 tom Exp $

 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -62,13 +62,13 @@ AC_DEFUN([AM_LANGINFO_CODESET],
   fi
 ])dnl
 dnl ---------------------------------------------------------------------------
   fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADA_INCLUDE_DIRS version: 5 updated: 2006/10/14 15:23:15
+dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07

 dnl -------------------
 dnl Construct the list of include-options for the C programs in the Ada95
 dnl binding.
 AC_DEFUN([CF_ADA_INCLUDE_DIRS],
 [
 dnl -------------------
 dnl Construct the list of include-options for the C programs in the Ada95
 dnl binding.
 AC_DEFUN([CF_ADA_INCLUDE_DIRS],
 [

-ACPPFLAGS="-I. -I../../include $ACPPFLAGS"
+ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"

 if test "$srcdir" != "."; then
        ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS"
 fi
 if test "$srcdir" != "."; then
        ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS"
 fi


@@ -86,7 +86,7 @@ fi
 AC_SUBST(ACPPFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(ACPPFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_CFLAGS version: 7 updated: 2004/04/25 17:48:30
+dnl CF_ADD_CFLAGS version: 9 updated: 2010/01/09 11:05:50

 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.


@@ -112,8 +112,8 @@ no)
                        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
 
                        test "${cf_add_cflags}" != "${cf_tst_cflags}" \
                        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
 
                        test "${cf_add_cflags}" != "${cf_tst_cflags}" \

-                       && test -z "${cf_tst_cflags}" \
-                       && cf_fix_cppflags=yes
+                               && test -z "${cf_tst_cflags}" \
+                               && cf_fix_cppflags=yes

 
                        if test $cf_fix_cppflags = yes ; then
                                cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
 
                        if test $cf_fix_cppflags = yes ; then
                                cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"


@@ -128,6 +128,12 @@ no)
                *$cf_add_cflags) #(vi
                        ;;
                *) #(vi
                *$cf_add_cflags) #(vi
                        ;;
                *) #(vi

+                       case $cf_add_cflags in #(vi
+                       -D*)
+                               cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+                               CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
+                               ;;
+                       esac

                        cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
                        ;;
                esac
                        cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
                        ;;
                esac


@@ -143,8 +149,8 @@ yes)
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
        test "${cf_add_cflags}" != "${cf_tst_cflags}" \
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
        test "${cf_add_cflags}" != "${cf_tst_cflags}" \

-       && test -z "${cf_tst_cflags}" \
-       && cf_fix_cppflags=no
+               && test -z "${cf_tst_cflags}" \
+               && cf_fix_cppflags=no

        ;;
 esac
 done
        ;;
 esac
 done


@@ -156,7 +162,7 @@ fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
 
 if test -n "$cf_new_cppflags" ; then
        ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])

-       CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"

 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then


@@ -168,7 +174,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
+dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47

 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,
 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,


@@ -195,7 +201,7 @@ if test -n "$1" ; then
                fi
 
                if test "$cf_have_incdir" = no ; then
                fi
 
                if test "$cf_have_incdir" = no ; then

-          if test "$cf_add_incdir" = /usr/local/include ; then
+                 if test "$cf_add_incdir" = /usr/local/include ; then

                        if test "$GCC" = yes
                        then
                          cf_save_CPPFLAGS=$CPPFLAGS
                        if test "$GCC" = yes
                        then
                          cf_save_CPPFLAGS=$CPPFLAGS


@@ -211,11 +217,11 @@ if test -n "$1" ; then
 
                if test "$cf_have_incdir" = no ; then
                  CF_VERBOSE(adding $cf_add_incdir to include-path)
 
                if test "$cf_have_incdir" = no ; then
                  CF_VERBOSE(adding $cf_add_incdir to include-path)

-                 ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
+                 ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,$2) -I$cf_add_incdir"

 
 

-          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-          test "$cf_top_incdir" = "$cf_add_incdir" && break
-          cf_add_incdir="$cf_top_incdir"
+                 cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+                 test "$cf_top_incdir" = "$cf_add_incdir" && break
+                 cf_add_incdir="$cf_top_incdir"

                else
                  break
                fi
                else
                  break
                fi


@@ -225,7 +231,7 @@ if test -n "$1" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34
+dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08

 dnl -------------
 dnl    Adds to the library-path
 dnl
 dnl -------------
 dnl    Adds to the library-path
 dnl


@@ -254,7 +260,7 @@ if test -n "$1" ; then
       fi
       if test "$cf_have_libdir" = no ; then
         CF_VERBOSE(adding $cf_add_libdir to library-path)
       fi
       if test "$cf_have_libdir" = no ; then
         CF_VERBOSE(adding $cf_add_libdir to library-path)

-        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
+        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)"

       fi
     fi
   done
       fi
     fi
   done


@@ -353,7 +359,70 @@ You have the following choices:
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18
+dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
+dnl --------------
+dnl Allow user to disable a normally-on option.
+AC_DEFUN([CF_ARG_DISABLE],
+[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41
+dnl -------------
+dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
+dnl values.
+dnl
+dnl Parameters:
+dnl $1 = option name
+dnl $2 = help-string
+dnl $3 = action to perform if option is not default
+dnl $4 = action if perform if option is default
+dnl $5 = default option value (either 'yes' or 'no')
+AC_DEFUN([CF_ARG_OPTION],
+[AC_ARG_ENABLE($1,[$2],[test "$enableval" != ifelse($5,no,yes,no) && enableval=ifelse($5,no,no,yes)
+  if test "$enableval" != "$5" ; then
+ifelse($3,,[    :]dnl
+,[    $3]) ifelse($4,,,[
+  else
+    $4])
+  fi],[enableval=$5 ifelse($4,,,[
+  $4
+])dnl
+  ])])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_AR_FLAGS version: 4 updated: 2009/02/07 13:42:23
+dnl -----------
+dnl Check for suitable "ar" (archiver) options for updating an archive.
+AC_DEFUN([CF_AR_FLAGS],[
+AC_REQUIRE([CF_PROG_AR])
+
+AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
+       cf_cv_ar_flags=unknown
+       for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
+       do
+               rm -f conftest.$ac_cv_objext
+               rm -f conftest.a
+
+               cat >conftest.$ac_ext <<EOF
+#line __oline__ "configure"
+int    testdata[[3]] = { 123, 456, 789 };
+EOF
+               if AC_TRY_EVAL(ac_compile) ; then
+                       $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
+                       if test -f conftest.a ; then
+                               cf_cv_ar_flags=$cf_ar_flags
+                               break
+                       fi
+               else
+                       CF_VERBOSE(cannot compile test-program)
+                       break
+               fi
+       done
+       rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+])
+test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
+AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03

 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 Check if awk can handle big strings using printf.  Some older versions of
 dnl awk choke on large strings passed via "%s".


@@ -362,19 +431,19 @@ dnl $1 = desired string size
 dnl $2 = variable to set with result
 AC_DEFUN([CF_AWK_BIG_PRINTF],
 [
 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 '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
-            eval $2=yes
-        else
-            eval $2=no
-        fi
-        ;;
-    esac
+       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 '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 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 ---------------------------------------------------------------------------
 dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18


@@ -887,7 +956,7 @@ fi
 test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_C_INLINE version: 2 updated: 2007/08/11 14:09:50
+dnl CF_C_INLINE version: 3 updated: 2010/05/01 15:14:41

 dnl -----------
 dnl Check if the C compiler supports "inline".
 dnl $1 is the name of a shell variable to set if inline is supported
 dnl -----------
 dnl Check if the C compiler supports "inline".
 dnl $1 is the name of a shell variable to set if inline is supported


@@ -902,7 +971,7 @@ if test "$ac_cv_c_inline" != no ; then
     :
   elif test "$GCC" = yes
   then
     :
   elif test "$GCC" = yes
   then

-    AC_CACHE_CHECK(if gcc supports options to tune inlining,cf_cv_gcc_inline,[
+    AC_CACHE_CHECK(if $CC supports options to tune inlining,cf_cv_gcc_inline,[

       cf_save_CFLAGS=$CFLAGS
       CFLAGS="$CFLAGS --param max-inline-insns-single=$2"
       AC_TRY_COMPILE([inline int foo(void) { return 1; }],
       cf_save_CFLAGS=$CFLAGS
       CFLAGS="$CFLAGS --param max-inline-insns-single=$2"
       AC_TRY_COMPILE([inline int foo(void) { return 1; }],


@@ -945,7 +1014,7 @@ done
 AC_SUBST(DIRS_TO_MAKE)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(DIRS_TO_MAKE)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_DISABLE_LEAKS version: 4 updated: 2006/12/16 15:10:42
+dnl CF_DISABLE_LEAKS version: 5 updated: 2010/03/13 15:14:55

 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl checks.
 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl checks.


@@ -958,7 +1027,7 @@ AC_REQUIRE([CF_WITH_VALGRIND])
 AC_MSG_CHECKING(if you want to perform memory-leak testing)
 AC_ARG_ENABLE(leaks,
        [  --disable-leaks         test: free permanent memory, analyze leaks],
 AC_MSG_CHECKING(if you want to perform memory-leak testing)
 AC_ARG_ENABLE(leaks,
        [  --disable-leaks         test: free permanent memory, analyze leaks],

-       [with_no_leaks=yes],
+       [if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi],

        : ${with_no_leaks:=no})
 AC_MSG_RESULT($with_no_leaks)
 
        : ${with_no_leaks:=no})
 AC_MSG_RESULT($with_no_leaks)
 


@@ -967,18 +1036,61 @@ if test "$with_no_leaks" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_ENABLE_RPATH version: 1 updated: 2008/09/13 10:22:30
+dnl CF_DISABLE_LIBTOOL_VERSION version: 1 updated: 2010/05/15 15:45:59
+dnl --------------------------
+dnl Check if we should use the libtool 1.5 feature "-version-number" instead of
+dnl the older "-version-info" feature.  The newer feature allows us to use
+dnl version numbering on shared libraries which make them compatible with
+dnl various systems.
+AC_DEFUN([CF_DISABLE_LIBTOOL_VERSION],
+[
+AC_MSG_CHECKING(if libtool -version-number should be used)
+CF_ARG_DISABLE(libtool-version,
+       [  --disable-libtool-version  enable to use libtool's incompatible naming scheme],
+       [cf_libtool_version=no],
+       [cf_libtool_version=yes])
+AC_MSG_RESULT($cf_libtool_version)
+
+if test "$cf_libtool_version" = yes ; then
+       LIBTOOL_VERSION="-version-number"
+else
+       LIBTOOL_VERSION="-version-info"
+fi
+
+AC_SUBST(LIBTOOL_VERSION)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_RPATH_HACK version: 1 updated: 2010/04/11 10:54:00
+dnl ---------------------
+dnl The rpath-hack makes it simpler to build programs, particularly with the
+dnl *BSD ports which may have essential libraries in unusual places.  But it
+dnl can interfere with building an executable for the base system.  Use this
+dnl option in that case.
+AC_DEFUN([CF_DISABLE_RPATH_HACK],
+[
+AC_MSG_CHECKING(if rpath should be not be set)
+CF_ARG_DISABLE(rpath-hack,
+       [  --disable-rpath-hack    don't add rpath options for additional libraries],
+       [cf_disable_rpath_hack=yes],
+       [cf_disable_rpath_hack=no])
+AC_MSG_RESULT($cf_disable_rpath_hack)
+if test "$cf_disable_rpath_hack" = no ; then
+       CF_RPATH_HACK
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42

 dnl ---------------
 dnl Check if the rpath option should be used, setting cache variable
 dnl ---------------
 dnl Check if the rpath option should be used, setting cache variable

-dnl cf_cv_ld_rpath if so.
+dnl cf_cv_enable_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],
 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)
+[cf_cv_enable_rpath=$enableval],
+[cf_cv_enable_rpath=no])
+AC_MSG_RESULT($cf_cv_enable_rpath)

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39


@@ -1019,7 +1131,7 @@ AC_MSG_RESULT($cf_result)
 CXXFLAGS="$cf_save_CXXFLAGS"
 ])
 dnl ---------------------------------------------------------------------------
 CXXFLAGS="$cf_save_CXXFLAGS"
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_FIND_LINKAGE version: 12 updated: 2007/07/29 20:13:53
+dnl CF_FIND_LINKAGE version: 18 updated: 2010/05/05 20:27:55

 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.
 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.


@@ -1048,10 +1160,26 @@ cf_cv_library_path_$3=
 
 CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)])
 
 
 CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)])
 

-AC_TRY_LINK([$1],[$2],
-    cf_cv_find_linkage_$3=yes,[
-    cf_cv_find_linkage_$3=no
+cf_save_LIBS="$LIBS"
+
+AC_TRY_LINK([$1],[$2],[
+       cf_cv_find_linkage_$3=yes
+       cf_cv_header_path_$3=/usr/include
+       cf_cv_library_path_$3=/usr/lib
+],[
+
+LIBS="-l$3 $7 $cf_save_LIBS"
+
+AC_TRY_LINK([$1],[$2],[
+       cf_cv_find_linkage_$3=yes
+       cf_cv_header_path_$3=/usr/include
+       cf_cv_library_path_$3=/usr/lib
+       cf_cv_library_file_$3="-l$3"
+],[
+       cf_cv_find_linkage_$3=no
+       LIBS="$cf_save_LIBS"

 
 

+    CF_VERBOSE(find linkage for $3 library)

     CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
 
     cf_save_CPPFLAGS="$CPPFLAGS"


@@ -1110,7 +1238,6 @@ AC_TRY_LINK([$1],[$2],
                 ])
           fi
         done
                 ])
           fi
         done

-        LIBS="$cf_save_LIBS"

         CPPFLAGS="$cf_save_CPPFLAGS"
         LDFLAGS="$cf_save_LDFLAGS"
       fi
         CPPFLAGS="$cf_save_CPPFLAGS"
         LDFLAGS="$cf_save_LDFLAGS"
       fi


@@ -1119,12 +1246,15 @@ AC_TRY_LINK([$1],[$2],
       cf_cv_find_linkage_$3=no
     fi
     ],$7)
       cf_cv_find_linkage_$3=no
     fi
     ],$7)

+])
+
+LIBS="$cf_save_LIBS"

 
 if test "$cf_cv_find_linkage_$3" = yes ; then
 ifelse([$4],,[
 
 if test "$cf_cv_find_linkage_$3" = yes ; then
 ifelse([$4],,[

-  CF_ADD_INCDIR($cf_cv_header_path_$3)
-  CF_ADD_LIBDIR($cf_cv_library_path_$3)
-  LIBS="-l$3 $LIBS"
+       CF_ADD_INCDIR($cf_cv_header_path_$3)
+       CF_ADD_LIBDIR($cf_cv_library_path_$3)
+       LIBS="-l$3 $LIBS"

 ],[$4])
 else
 ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
 ],[$4])
 else
 ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])


@@ -1362,7 +1492,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_ATTRIBUTES version: 11 updated: 2007/07/29 09:55:12
+dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56

 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary


@@ -1408,26 +1538,61 @@ extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
 extern void foo(void) GCC_NORETURN;
 int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
 EOF
 extern void foo(void) GCC_NORETURN;
 int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
 EOF

+       cf_printf_attribute=no
+       cf_scanf_attribute=no

        for cf_attribute in scanf printf unused noreturn
        do
                CF_UPPER(cf_ATTRIBUTE,$cf_attribute)
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
        for cf_attribute in scanf printf unused noreturn
        do
                CF_UPPER(cf_ATTRIBUTE,$cf_attribute)
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC

-               case $cf_attribute in
-               scanf|printf)
-               cat >conftest.h <<EOF
+
+               case $cf_attribute in #(vi
+               printf) #(vi
+                       cf_printf_attribute=yes
+                       cat >conftest.h <<EOF

 #define GCC_$cf_ATTRIBUTE 1
 EOF
                        ;;
 #define GCC_$cf_ATTRIBUTE 1
 EOF
                        ;;

-               *)
-               cat >conftest.h <<EOF
+               scanf) #(vi
+                       cf_scanf_attribute=yes
+                       cat >conftest.h <<EOF
+#define GCC_$cf_ATTRIBUTE 1
+EOF
+                       ;;
+               *) #(vi
+                       cat >conftest.h <<EOF

 #define GCC_$cf_ATTRIBUTE $cf_directive
 EOF
                        ;;
                esac
 #define GCC_$cf_ATTRIBUTE $cf_directive
 EOF
                        ;;
                esac

+

                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h

+                       case $cf_attribute in #(vi
+                       printf) #(vi
+                               if test "$cf_printf_attribute" = no ; then
+                                       cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) /* nothing */
+EOF
+                               else
+                                       cat >>confdefs.h <<EOF
+#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
+EOF
+                               fi
+                               ;;
+                       scanf) #(vi
+                               if test "$cf_scanf_attribute" = no ; then
+                                       cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var) /* nothing */
+EOF
+                               else
+                                       cat >>confdefs.h <<EOF
+#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
+EOF
+                               fi
+                               ;;
+                       esac

                fi
        done
 else
                fi
        done
 else


@@ -1437,7 +1602,7 @@ rm -rf conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_VERSION version: 4 updated: 2005/08/27 09:53:42
+dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31

 dnl --------------
 dnl Find version of gcc
 AC_DEFUN([CF_GCC_VERSION],[
 dnl --------------
 dnl Find version of gcc
 AC_DEFUN([CF_GCC_VERSION],[


@@ -1445,13 +1610,13 @@ AC_REQUIRE([AC_PROG_CC])
 GCC_VERSION=none
 if test "$GCC" = yes ; then
        AC_MSG_CHECKING(version of $CC)
 GCC_VERSION=none
 if test "$GCC" = yes ; then
        AC_MSG_CHECKING(version of $CC)

-       GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+       GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"

        test -z "$GCC_VERSION" && GCC_VERSION=unknown
        AC_MSG_RESULT($GCC_VERSION)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
        test -z "$GCC_VERSION" && GCC_VERSION=unknown
        AC_MSG_RESULT($GCC_VERSION)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GCC_WARNINGS version: 23 updated: 2008/07/26 17:54:02
+dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31

 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:
 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:


@@ -1484,7 +1649,6 @@ if test "$INTEL_COMPILER" = yes
 then
 # The "-wdXXX" options suppress warnings:
 # remark #1419: external declaration in primary source file
 then
 # The "-wdXXX" options suppress warnings:
 # remark #1419: external declaration in primary source file

-# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)

 # remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
 # remark #193: zero used for undefined preprocessing identifier
 # remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
 # remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
 # remark #193: zero used for undefined preprocessing identifier


@@ -1492,19 +1656,18 @@ then
 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
 # remark #869: parameter "tw" was never referenced
 # remark #981: operands are evaluated in unspecified order
 # remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
 # remark #869: parameter "tw" was never referenced
 # remark #981: operands are evaluated in unspecified order

-# warning #269: invalid format string conversion
+# warning #279: controlling expression is constant

 
        AC_CHECKING([for $CC warning options])
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"
        for cf_opt in \
                wd1419 \
 
        AC_CHECKING([for $CC warning options])
        cf_save_CFLAGS="$CFLAGS"
        EXTRA_CFLAGS="-Wall"
        for cf_opt in \
                wd1419 \

-               wd1682 \

                wd1683 \
                wd1684 \
                wd193 \
                wd1683 \
                wd1684 \
                wd193 \

-               wd279 \

                wd593 \
                wd593 \

+               wd279 \

                wd810 \
                wd869 \
                wd981
                wd810 \
                wd869 \
                wd981


@@ -1521,10 +1684,10 @@ elif test "$GCC" = yes
 then
        AC_CHECKING([for $CC warning options])
        cf_save_CFLAGS="$CFLAGS"
 then
        AC_CHECKING([for $CC warning options])
        cf_save_CFLAGS="$CFLAGS"

-       EXTRA_CFLAGS="-W -Wall"
+       EXTRA_CFLAGS=

        cf_warn_CONST=""
        test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
        cf_warn_CONST=""
        test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"

-       for cf_opt in \
+       for cf_opt in W Wall \

                Wbad-function-cast \
                Wcast-align \
                Wcast-qual \
                Wbad-function-cast \
                Wcast-align \
                Wcast-qual \


@@ -1679,7 +1842,7 @@ make an error
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_GPP_LIBRARY version: 8 updated: 2003/02/02 01:41:46
+dnl CF_GPP_LIBRARY version: 9 updated: 2009/12/19 13:46:49

 dnl --------------
 dnl If we're trying to use g++, test if libg++ is installed (a rather common
 dnl problem :-).  If we have the compiler but no library, we'll be able to
 dnl --------------
 dnl If we're trying to use g++, test if libg++ is installed (a rather common
 dnl problem :-).  If we have the compiler but no library, we'll be able to


@@ -1698,7 +1861,7 @@ esac
 if test "$GXX" = yes; then
        AC_MSG_CHECKING([for lib$cf_gpp_libname])
        cf_save="$LIBS"
 if test "$GXX" = yes; then
        AC_MSG_CHECKING([for lib$cf_gpp_libname])
        cf_save="$LIBS"

-       LIBS="$LIBS -l$cf_gpp_libname"
+       LIBS="-l$cf_gpp_libname $LIBS"

        AC_TRY_LINK([
 #include <$cf_gpp_libname/builtin.h>
        ],
        AC_TRY_LINK([
 #include <$cf_gpp_libname/builtin.h>
        ],


@@ -1998,7 +2161,7 @@ done
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_HEADER_PATH version: 9 updated: 2008/12/07 19:38:31
+dnl CF_HEADER_PATH version: 12 updated: 2010/05/05 05:22:40

 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl
 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl


@@ -2007,6 +2170,9 @@ dnl       $1 = the variable to return as result
 dnl    $2 = the package name
 AC_DEFUN([CF_HEADER_PATH],
 [
 dnl    $2 = the package name
 AC_DEFUN([CF_HEADER_PATH],
 [

+$1=
+
+# collect the current set of include-directories from compiler flags

 cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
 cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS


@@ -2021,6 +2187,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then
        done
 fi
 
        done
 fi
 

+# add the variations for the package we are looking for

 CF_SUBDIR_PATH($1,$2,include)
 
 test "$includedir" != NONE && \
 CF_SUBDIR_PATH($1,$2,include)
 
 test "$includedir" != NONE && \


@@ -2037,7 +2204,7 @@ test -d "$oldincludedir" && {
        test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
 }
 
        test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
 }
 

-$1="$cf_header_path_list [$]$1"
+$1="[$]$1 $cf_header_path_list"

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23


@@ -2047,7 +2214,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_INCLUDE_DIRS version: 5 updated: 2006/10/14 15:23:15
+dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40

 dnl ---------------
 dnl Construct the list of include-options according to whether we're building
 dnl in the source directory or using '--srcdir=DIR' option.  If we're building
 dnl ---------------
 dnl Construct the list of include-options according to whether we're building
 dnl in the source directory or using '--srcdir=DIR' option.  If we're building


@@ -2055,9 +2222,9 @@ dnl with gcc, don't append the includedir if it happens to be /usr/include,
 dnl since that usually breaks gcc's shadow-includes.
 AC_DEFUN([CF_INCLUDE_DIRS],
 [
 dnl since that usually breaks gcc's shadow-includes.
 AC_DEFUN([CF_INCLUDE_DIRS],
 [

-CPPFLAGS="-I. -I../include $CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I. -I../include"

 if test "$srcdir" != "."; then
 if test "$srcdir" != "."; then

-       CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
+       CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"

 fi
 if test "$GCC" != yes; then
        CPPFLAGS="$CPPFLAGS -I\${includedir}"
 fi
 if test "$GCC" != yes; then
        CPPFLAGS="$CPPFLAGS -I\${includedir}"


@@ -2164,7 +2331,7 @@ ifdef([AC_FUNC_FSEEKO],[
 ])
 ])
 dnl ---------------------------------------------------------------------------
 ])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20
+dnl CF_LDFLAGS_STATIC version: 7 updated: 2009/04/04 18:31:04

 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
 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


@@ -2174,7 +2341,7 @@ AC_DEFUN([CF_LDFLAGS_STATIC],[
 
 if test "$GCC" = yes ; then
        case $cf_cv_system_name in #(
 
 if test "$GCC" = yes ; then
        case $cf_cv_system_name in #(

-       OS/2*|os2*|aix[[45]]*)  #( vi
+       OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]]|darwin*)         #( vi

                LDFLAGS_STATIC=
                LDFLAGS_SHARED=
                ;;
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=
                ;;


@@ -2185,7 +2352,7 @@ if test "$GCC" = yes ; then
     esac
 else
        case $cf_cv_system_name in #(
     esac
 else
        case $cf_cv_system_name in #(

-       aix[[45]]*)     #( from ld manpage
+       aix[[456]]*)    #( from ld manpage

                LDFLAGS_STATIC=-bstatic
                LDFLAGS_SHARED=-bdynamic
                ;;
                LDFLAGS_STATIC=-bstatic
                LDFLAGS_SHARED=-bdynamic
                ;;


@@ -2200,7 +2367,7 @@ else
                ;;
        osf[[45]]*)     #( from ld manpage osf4.0d, osf5.1
                # alternative "-oldstyle_liblookup" (not in cc manpage)
                ;;
        osf[[45]]*)     #( from ld manpage osf4.0d, osf5.1
                # alternative "-oldstyle_liblookup" (not in cc manpage)

-               LDFLAGS_STATIC=-noso 
+               LDFLAGS_STATIC=-noso

                LDFLAGS_SHARED=-so_archive
                ;;
        solaris2*)
                LDFLAGS_SHARED=-so_archive
                ;;
        solaris2*)


@@ -2214,7 +2381,61 @@ AC_SUBST(LDFLAGS_STATIC)
 AC_SUBST(LDFLAGS_SHARED)
 ])
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LDFLAGS_SHARED)
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31
+dnl CF_LD_RPATH_OPT version: 2 updated: 2010/03/27 19:27:54
+dnl ---------------
+dnl For the given system and compiler, find the compiler flags to pass to the
+dnl loader to use the "rpath" feature.
+AC_DEFUN([CF_LD_RPATH_OPT],
+[
+AC_REQUIRE([CF_CHECK_CACHE])
+
+LD_RPATH_OPT=
+AC_MSG_CHECKING(for an rpath option)
+case $cf_cv_system_name in #(vi
+irix*) #(vi
+       if test "$GCC" = yes; then
+               LD_RPATH_OPT="-Wl,-rpath,"
+       else
+               LD_RPATH_OPT="-rpath "
+       fi
+       ;;
+linux*|gnu*|k*bsd*-gnu) #(vi
+       LD_RPATH_OPT="-Wl,-rpath,"
+       ;;
+openbsd[[2-9]].*) #(vi
+       LD_RPATH_OPT="-Wl,-rpath,"
+       ;;
+freebsd*) #(vi
+       LD_RPATH_OPT="-rpath "
+       ;;
+netbsd*) #(vi
+       LD_RPATH_OPT="-Wl,-rpath,"
+       ;;
+osf*|mls+*) #(vi
+       LD_RPATH_OPT="-rpath "
+       ;;
+solaris2*) #(vi
+       LD_RPATH_OPT="-R"
+       ;;
+*)
+       ;;
+esac
+AC_MSG_RESULT($LD_RPATH_OPT)
+
+case "x$LD_RPATH_OPT" in #(vi
+x-R*)
+       AC_MSG_CHECKING(if we need a space after rpath option)
+       cf_save_LIBS="$LIBS"
+       LIBS="${LD_RPATH_OPT}$libdir $LIBS"
+       AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
+       LIBS="$cf_save_LIBS"
+       AC_MSG_RESULT($cf_rpath_space)
+       test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+       ;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_LIBRARY_PATH version: 9 updated: 2010/03/28 12:52:50

 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl
 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl


@@ -2223,6 +2444,7 @@ dnl       $1 = the variable to return as result
 dnl    $2 = the package name
 AC_DEFUN([CF_LIBRARY_PATH],
 [
 dnl    $2 = the package name
 AC_DEFUN([CF_LIBRARY_PATH],
 [

+$1=

 cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
 cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS


@@ -2259,7 +2481,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_RULES version: 55 updated: 2008/12/13 16:17:38
+dnl CF_LIB_RULES version: 56 updated: 2010/05/15 15:19:46

 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
 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


@@ -2464,6 +2686,7 @@ do
                                overwrite=$WITH_OVERWRITE \
                                depend="$cf_depend" \
                                host="$host" \
                                overwrite=$WITH_OVERWRITE \
                                depend="$cf_depend" \
                                host="$host" \

+                               libtool_version="$LIBTOOL_VERSION" \

                                $srcdir/$cf_dir/modules >>$cf_dir/Makefile
 
                        cf_suffix="$old_cf_suffix"
                                $srcdir/$cf_dir/modules >>$cf_dir/Makefile
 
                        cf_suffix="$old_cf_suffix"


@@ -2733,7 +2956,7 @@ fi
 ])
 ])
 dnl ---------------------------------------------------------------------------
 ])
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_LIB_SUFFIX version: 15 updated: 2008/09/13 11:54:48
+dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03

 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name
 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name


@@ -2743,40 +2966,44 @@ dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
 AC_DEFUN([CF_LIB_SUFFIX],
 [
        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
 AC_DEFUN([CF_LIB_SUFFIX],
 [
        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])

-       case $1 in
-       libtool)
+       case $1 in #(vi
+       libtool) #(vi

                $2='.la'
                $3=[$]$2
                ;;
                $2='.la'
                $3=[$]$2
                ;;

-       normal)
+       normal) #(vi

                $2='.a'
                $3=[$]$2
                ;;
                $2='.a'
                $3=[$]$2
                ;;

-       debug)
+       debug) #(vi

                $2='_g.a'
                $3=[$]$2
                ;;
                $2='_g.a'
                $3=[$]$2
                ;;

-       profile)
+       profile) #(vi

                $2='_p.a'
                $3=[$]$2
                ;;
                $2='_p.a'
                $3=[$]$2
                ;;

-       shared)
+       shared) #(vi

                case $cf_cv_system_name in
                case $cf_cv_system_name in

-               cygwin*)
+               aix[[56]]*) #(vi
+                       $2='.a'
+                       $3=[$]$2
+                       ;;
+               cygwin*) #(vi

                        $2='.dll'
                        $3='.dll.a'
                        ;;
                        $2='.dll'
                        $3='.dll.a'
                        ;;

-               darwin*)
+               darwin*) #(vi

                        $2='.dylib'
                        $3=[$]$2
                        ;;
                        $2='.dylib'
                        $3=[$]$2
                        ;;

-               hpux*)
+               hpux*) #(vi

                        case $target in
                        case $target in

-                       ia64*)
+                       ia64*) #(vi

                                $2='.so'
                                $3=[$]$2
                                ;;
                                $2='.so'
                                $3=[$]$2
                                ;;

-                       *)
+                       *) #(vi

                                $2='.sl'
                                $3=[$]$2
                                ;;
                                $2='.sl'
                                $3=[$]$2
                                ;;


@@ -2809,7 +3036,7 @@ AC_DEFUN([CF_LIB_TYPE],
        test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
 ])dnl
 dnl ---------------------------------------------------------------------------
        test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_LINK_DATAONLY version: 8 updated: 2006/12/16 12:33:30
+dnl CF_LINK_DATAONLY version: 9 updated: 2009/01/01 20:21:38

 dnl ----------------
 dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
 dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
 dnl ----------------
 dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
 dnl only data (i.e., no functions), for example NeXT.  On those systems we'll


@@ -2826,7 +3053,7 @@ int       testdata[[3]] = { 123, 456, 789 };
 EOF
        if AC_TRY_EVAL(ac_compile) ; then
                mv conftest.o data.o && \
 EOF
        if AC_TRY_EVAL(ac_compile) ; then
                mv conftest.o data.o && \

-               ( $AR $AR_OPTS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
+               ( $AR $ARFLAGS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null

        fi
        rm -f conftest.$ac_ext data.o
        cat >conftest.$ac_ext <<EOF
        fi
        rm -f conftest.$ac_ext data.o
        cat >conftest.$ac_ext <<EOF


@@ -2845,7 +3072,7 @@ int       testfunc()
 EOF
        if AC_TRY_EVAL(ac_compile); then
                mv conftest.o func.o && \
 EOF
        if AC_TRY_EVAL(ac_compile); then
                mv conftest.o func.o && \

-               ( $AR $AR_OPTS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
+               ( $AR $ARFLAGS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null

        fi
        rm -f conftest.$ac_ext func.o
        ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
        fi
        rm -f conftest.$ac_ext func.o
        ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null


@@ -2981,16 +3208,20 @@ CF_EOF
 AC_SUBST(cf_cv_makeflags)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(cf_cv_makeflags)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MAKE_TAGS version: 2 updated: 2000/10/04 09:18:40
+dnl CF_MAKE_TAGS version: 5 updated: 2010/04/03 20:07:32

 dnl ------------
 dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
 dnl a monocase filesystem.
 AC_DEFUN([CF_MAKE_TAGS],[
 AC_REQUIRE([CF_MIXEDCASE_FILENAMES])
 dnl ------------
 dnl Generate tags/TAGS targets for makefiles.  Do not generate TAGS if we have
 dnl a monocase filesystem.
 AC_DEFUN([CF_MAKE_TAGS],[
 AC_REQUIRE([CF_MIXEDCASE_FILENAMES])

-AC_CHECK_PROG(MAKE_LOWER_TAGS, ctags, yes, no)
+
+AC_CHECK_PROGS(CTAGS, exctags ctags)
+AC_CHECK_PROGS(ETAGS, exetags etags)
+
+AC_CHECK_PROG(MAKE_LOWER_TAGS, ${CTAGS-ctags}, yes, no)

 
 if test "$cf_cv_mixedcase" = yes ; then
 
 if test "$cf_cv_mixedcase" = yes ; then

-       AC_CHECK_PROG(MAKE_UPPER_TAGS, etags, yes, no)
+       AC_CHECK_PROG(MAKE_UPPER_TAGS, ${ETAGS-etags}, yes, no)

 else
        MAKE_UPPER_TAGS=no
 fi
 else
        MAKE_UPPER_TAGS=no
 fi


@@ -3000,17 +3231,21 @@ if test "$MAKE_UPPER_TAGS" = yes ; then
 else
        MAKE_UPPER_TAGS="#"
 fi
 else
        MAKE_UPPER_TAGS="#"
 fi

-AC_SUBST(MAKE_UPPER_TAGS)

 
 if test "$MAKE_LOWER_TAGS" = yes ; then
        MAKE_LOWER_TAGS=
 else
        MAKE_LOWER_TAGS="#"
 fi
 
 if test "$MAKE_LOWER_TAGS" = yes ; then
        MAKE_LOWER_TAGS=
 else
        MAKE_LOWER_TAGS="#"
 fi

+
+AC_SUBST(CTAGS)
+AC_SUBST(ETAGS)
+
+AC_SUBST(MAKE_UPPER_TAGS)

 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MANPAGE_FORMAT version: 7 updated: 2003/12/20 19:30:34
+dnl CF_MANPAGE_FORMAT version: 8 updated: 2009/01/11 20:30:50

 dnl -----------------
 dnl Option to allow user to override automatic configuration of manpage format.
 dnl There are several special cases:
 dnl -----------------
 dnl Option to allow user to override automatic configuration of manpage format.
 dnl There are several special cases:


@@ -3052,7 +3287,7 @@ unknown)
   cf_catonly=yes
   cf_example=date
 
   cf_catonly=yes
   cf_example=date
 

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"

   for cf_dir in $MANPATH; do
     test -z "$cf_dir" && cf_dir=/usr/man
     for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
   for cf_dir in $MANPATH; do
     test -z "$cf_dir" && cf_dir=/usr/man
     for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example


@@ -3225,7 +3460,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MAN_PAGES version: 35 updated: 2007/03/31 11:47:29
+dnl CF_MAN_PAGES version: 37 updated: 2010/05/15 16:05:34

 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that


@@ -3291,8 +3526,6 @@ NCURSES_PATCH="$NCURSES_PATCH"
 NCURSES_OSPEED="$NCURSES_OSPEED"
 TERMINFO="$TERMINFO"
 
 NCURSES_OSPEED="$NCURSES_OSPEED"
 TERMINFO="$TERMINFO"
 

-MKDIRS="sh `cd $srcdir && pwd`/mkdirs.sh"
-

 INSTALL="$INSTALL"
 INSTALL_DATA="$INSTALL_DATA"
 
 INSTALL="$INSTALL"
 INSTALL_DATA="$INSTALL_DATA"
 


@@ -3336,7 +3569,7 @@ case \$i in #(vi
        section=\`expr "\$i" : '.*\\.\\([[0-9]]\\)[[xm]]*'\`;
        if test \$verb = installing ; then
        if test ! -d \$cf_subdir\${section} ; then
        section=\`expr "\$i" : '.*\\.\\([[0-9]]\\)[[xm]]*'\`;
        if test \$verb = installing ; then
        if test ! -d \$cf_subdir\${section} ; then

-               \$MKDIRS \$cf_subdir\$section
+               mkdir -p \$cf_subdir\$section

        fi
        fi
 
        fi
        fi
 


@@ -3356,7 +3589,7 @@ CF_EOF
                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
                cf_name=`echo $cf_name|sed "$program_transform_name"`
 cat >>$cf_edit_man <<-CF_EOF
                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
                cf_name=`echo $cf_name|sed "$program_transform_name"`
 cat >>$cf_edit_man <<-CF_EOF

-               s,@$cf_NAME@,$cf_name,
+               s,@$cf_NAME@,$cf_name,g

 CF_EOF
        done
        ])
 CF_EOF
        done
        ])


@@ -3545,7 +3778,7 @@ chmod 755 $cf_edit_man
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_MATH_LIB version: 5 updated: 2000/05/28 01:39:10
+dnl CF_MATH_LIB version: 6 updated: 2009/12/19 13:46:49

 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler


@@ -3564,7 +3797,7 @@ AC_CACHE_CHECK(if -lm needed for math functions,
 if test "$cf_cv_need_libm" = yes
 then
 ifelse($1,,[
 if test "$cf_cv_need_libm" = yes
 then
 ifelse($1,,[

-       LIBS="$LIBS -lm"
+       LIBS="-lm $LIBS"

 ],[$1=-lm])
 fi
 ])
 ],[$1=-lm])
 fi
 ])


@@ -3741,17 +3974,17 @@ AC_DEFUN([CF_OBJ_SUBDIR],
        esac
 ])dnl
 dnl ---------------------------------------------------------------------------
        esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PATHSEP version: 3 updated: 2001/01/12 01:23:53
+dnl CF_PATHSEP version: 4 updated: 2009/01/11 20:30:23

 dnl ----------
 dnl Provide a value for the $PATH and similar separator
 AC_DEFUN([CF_PATHSEP],
 [
        case $cf_cv_system_name in
 dnl ----------
 dnl Provide a value for the $PATH and similar separator
 AC_DEFUN([CF_PATHSEP],
 [
        case $cf_cv_system_name in

-       os2*)   PATHSEP=';'  ;;
-       *)      PATHSEP=':'  ;;
+       os2*)   PATH_SEPARATOR=';'  ;;
+       *)      PATH_SEPARATOR=':'  ;;

        esac
        esac

-ifelse($1,,,[$1=$PATHSEP])
-       AC_SUBST(PATHSEP)
+ifelse($1,,,[$1=$PATH_SEPARATOR])
+       AC_SUBST(PATH_SEPARATOR)

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59


@@ -3791,7 +4024,39 @@ case ".[$]$1" in #(vi
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10
+dnl CF_PKG_CONFIG version: 3 updated: 2009/01/25 10:55:09
+dnl -------------
+dnl Check for the package-config program, unless disabled by command-line.
+AC_DEFUN([CF_PKG_CONFIG],
+[
+AC_MSG_CHECKING(if you want to use pkg-config)
+AC_ARG_WITH(pkg-config,
+       [  --with-pkg-config{=path} enable/disable use of pkg-config],
+       [cf_pkg_config=$withval],
+       [cf_pkg_config=yes])
+AC_MSG_RESULT($cf_pkg_config)
+
+case $cf_pkg_config in #(vi
+no) #(vi
+       PKG_CONFIG=none
+       ;;
+yes) #(vi
+       AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
+       ;;
+*)
+       PKG_CONFIG=$withval
+       ;;
+esac
+
+test -z "$PKG_CONFIG" && PKG_CONFIG=none
+if test "$PKG_CONFIG" != none ; then
+       CF_PATH_SYNTAX(PKG_CONFIG)
+fi
+
+AC_SUBST(PKG_CONFIG)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_POSIX_C_SOURCE version: 7 updated: 2010/01/09 11:05:50

 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
 dnl
 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
 dnl


@@ -3859,12 +4124,7 @@ make an error
 if test "$cf_cv_posix_c_source" != no ; then
        CFLAGS="$cf_trim_CFLAGS"
        CPPFLAGS="$cf_trim_CPPFLAGS"
 if test "$cf_cv_posix_c_source" != no ; then
        CFLAGS="$cf_trim_CFLAGS"
        CPPFLAGS="$cf_trim_CPPFLAGS"

-       if test "$cf_cv_cc_u_d_options" = yes ; then
-               cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \
-                               sed -e 's/-D/-U/g' -e 's/=[[^   ]]*//g'`
-               CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source"
-       fi
-       CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source"
+       CF_ADD_CFLAGS($cf_cv_posix_c_source)

 fi
 
 ])dnl
 fi
 
 ])dnl


@@ -3926,6 +4186,13 @@ done
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------

+dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22
+dnl ----------
+dnl Check for archiver "ar".
+AC_DEFUN([CF_PROG_AR],[
+AC_CHECK_TOOL(AR, ar, ar)
+])
+dnl ---------------------------------------------------------------------------

 dnl CF_PROG_AWK version: 1 updated: 2006/09/16 11:40:59
 dnl -----------
 dnl Check for awk, ensure that the check found something.
 dnl CF_PROG_AWK version: 1 updated: 2006/09/16 11:40:59
 dnl -----------
 dnl Check for awk, ensure that the check found something.


@@ -4077,49 +4344,88 @@ fi
 AC_SUBST(LDCONFIG)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LDCONFIG)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_PROG_LINT version: 1 updated: 2006/09/16 11:40:59
+dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14

 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [

-AC_CHECK_PROGS(LINT, tdlint lint alint)
+AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint)

 AC_SUBST(LINT_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LINT_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_REGEX version: 3 updated: 1997/11/01 14:26:01
+dnl CF_REGEX version: 6 updated: 2010/03/27 13:41:56

 dnl --------
 dnl Attempt to determine if we've got one of the flavors of regular-expression
 dnl code that we can support.
 AC_DEFUN([CF_REGEX],
 [
 dnl --------
 dnl Attempt to determine if we've got one of the flavors of regular-expression
 dnl code that we can support.
 AC_DEFUN([CF_REGEX],
 [

-AC_MSG_CHECKING([for regular-expression headers])
-AC_CACHE_VAL(cf_cv_regex,[
-AC_TRY_LINK([#include <sys/types.h>
-#include <regex.h>],[
-       regex_t *p;
-       int x = regcomp(p, "", 0);
-       int y = regexec(p, "", 0, 0, 0);
-       regfree(p);
-       ],[cf_cv_regex="regex.h"],[
-       AC_TRY_LINK([#include <regexp.h>],[
-               char *p = compile("", "", "", 0);
-               int x = step("", "");
-       ],[cf_cv_regex="regexp.h"],[
-               cf_save_LIBS="$LIBS"
-               LIBS="-lgen $LIBS"
-               AC_TRY_LINK([#include <regexpr.h>],[
-                       char *p = compile("", "", "");
+
+cf_regex_func=no
+
+AC_CHECK_FUNC(regcomp,[cf_regex_func=regcomp],[
+       for cf_regex_lib in regex re
+       do
+               AC_CHECK_LIB($cf_regex_lib,regcomp,[
+                               LIBS="-l$cf_regex_lib $LIBS"
+                               cf_regex_func=regcomp
+                               break])
+       done
+])
+
+if test "$cf_regex_func" = no ; then
+       AC_CHECK_FUNC(compile,[cf_regex_func=compile],[
+               AC_CHECK_LIB(gen,compile,[
+                               LIBS="-lgen $LIBS"
+                               cf_regex_func=compile])])
+fi
+
+if test "$cf_regex_func" = no ; then
+       AC_MSG_WARN(cannot find regular expression library)
+fi
+
+AC_CACHE_CHECK(for regular-expression headers,cf_cv_regex_hdrs,[
+
+cf_cv_regex_hdrs=no
+case $cf_regex_func in #(vi
+compile) #(vi
+       for cf_regex_hdr in regexp.h regexpr.h
+       do
+               AC_TRY_LINK([#include <$cf_regex_hdr>],[
+                       char *p = compile("", "", "", 0);

                        int x = step("", "");
                        int x = step("", "");

-               ],[cf_cv_regex="regexpr.h"],[LIBS="$cf_save_LIBS"])])])
+               ],[
+                       cf_cv_regex_hdrs=$cf_regex_hdr
+                       break
+               ])
+       done
+       ;;
+*)
+       for cf_regex_hdr in regex.h
+       do
+               AC_TRY_LINK([#include <sys/types.h>
+#include <$cf_regex_hdr>],[
+                       regex_t *p;
+                       int x = regcomp(p, "", 0);
+                       int y = regexec(p, "", 0, 0, 0);
+                       regfree(p);
+               ],[
+                       cf_cv_regex_hdrs=$cf_regex_hdr
+                       break
+               ])
+       done
+       ;;
+esac
+

 ])
 ])

-AC_MSG_RESULT($cf_cv_regex)
-case $cf_cv_regex in
-       regex.h)   AC_DEFINE(HAVE_REGEX_H_FUNCS) ;;
-       regexp.h)  AC_DEFINE(HAVE_REGEXP_H_FUNCS) ;;
-       regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS) ;;
+
+case $cf_cv_regex_hdrs in #(vi
+    no)               AC_MSG_WARN(no regular expression header found) ;; #(vi
+    regex.h)   AC_DEFINE(HAVE_REGEX_H_FUNCS) ;; #(vi
+    regexp.h)  AC_DEFINE(HAVE_REGEXP_H_FUNCS) ;; #(vi
+    regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS) ;;

 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_REMOVE_DEFINE version: 2 updated: 2005/07/09 16:12:18
+dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50

 dnl ----------------
 dnl Remove all -U and -D options that refer to the given symbol from a list
 dnl of C compiler options.  This works around the problem that not all
 dnl ----------------
 dnl Remove all -U and -D options that refer to the given symbol from a list
 dnl of C compiler options.  This works around the problem that not all


@@ -4131,10 +4437,9 @@ dnl $2 = source (including '$')
 dnl $3 = symbol to remove
 define([CF_REMOVE_DEFINE],
 [
 dnl $3 = symbol to remove
 define([CF_REMOVE_DEFINE],
 [

-# remove $3 symbol from $2

 $1=`echo "$2" | \
 $1=`echo "$2" | \

-       sed     -e 's/-[[UD]]$3\(=[[^   ]]*\)\?[[       ]]/ /g' \
-               -e 's/-[[UD]]$3\(=[[^   ]]*\)\?[$]//g'`
+       sed     -e 's/-[[UD]]'"$3"'\(=[[^       ]]*\)\?[[       ]]/ /g' \
+               -e 's/-[[UD]]'"$3"'\(=[[^       ]]*\)\?[$]//g'`

 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_REMOVE_LIB version: 1 updated: 2007/02/17 14:11:52
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_REMOVE_LIB version: 1 updated: 2007/02/17 14:11:52


@@ -4150,58 +4455,95 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_RPATH_HACK version: 4 updated: 2008/09/13 12:53:26
+dnl CF_RPATH_HACK version: 8 updated: 2010/04/17 15:38:58

 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],
 [
 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],
 [

-AC_REQUIRE([CF_SHARED_OPTS])
+AC_REQUIRE([CF_LD_RPATH_OPT])

 AC_MSG_CHECKING(for updated LDFLAGS)
 AC_MSG_CHECKING(for updated LDFLAGS)

-if test -n "$LDFLAGS" ; then
-AC_MSG_RESULT(maybe)
-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,"
-       ;;
--R\ *)
-       cf_rpath_hack="-R "
-       ;;
--R*)
-       cf_rpath_hack="-R"
-       ;;
-*)
-       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"
-                       ;;
-               esac
-               cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-       done
-       LDFLAGS=$cf_rpath_dst
-       CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
+if test -n "$LD_RPATH_OPT" ; then
+       AC_MSG_RESULT(maybe)
+
+       AC_CHECK_PROGS(cf_ldd_prog,ldd,no)
+       cf_rpath_list="/usr/lib /lib"
+       if test "$cf_ldd_prog" != no
+       then
+AC_TRY_LINK([#include <stdio.h>],
+               [printf("Hello");],
+               [cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[     ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
+       fi
+
+       CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+
+       CF_RPATH_HACK_2(LDFLAGS)
+       CF_RPATH_HACK_2(LIBS)
+

        CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
 fi
        CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
 fi

-else
-AC_MSG_RESULT(no)
-fi
+AC_SUBST(EXTRA_LDFLAGS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_RPATH_HACK_2 version: 6 updated: 2010/04/17 16:31:24
+dnl ---------------
+dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
+dnl EXTRA_LDFLAGS for each -L option found.
+dnl
+dnl $cf_rpath_list contains a list of directories to ignore.
+dnl
+dnl $1 = variable name to update.  The LDFLAGS variable should be the only one,
+dnl      but LIBS often has misplaced -L options.
+AC_DEFUN([CF_RPATH_HACK_2],
+[
+CF_VERBOSE(...checking $1 [$]$1)
+
+cf_rpath_dst=
+for cf_rpath_src in [$]$1
+do
+       case $cf_rpath_src in #(vi
+       -L*) #(vi
+
+               # check if this refers to a directory which we will ignore
+               cf_rpath_skip=no
+               if test -n "$cf_rpath_list"
+               then
+                       for cf_rpath_item in $cf_rpath_list
+                       do
+                               if test "x$cf_rpath_src" = "x-L$cf_rpath_item"
+                               then
+                                       cf_rpath_skip=yes
+                                       break
+                               fi
+                       done
+               fi
+
+               if test "$cf_rpath_skip" = no
+               then
+                       # transform the option
+                       if test "$LD_RPATH_OPT" = "-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%$LD_RPATH_OPT%"`
+                       fi
+
+                       # if we have not already added this, add it now
+                       cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"`
+                       if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS"
+                       then
+                               CF_VERBOSE(...Filter $cf_rpath_src ->$cf_rpath_tmp)
+                               EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+                       fi
+               fi
+               ;;
+       esac
+       cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+done
+$1=$cf_rpath_dst
+
+CF_VERBOSE(...checked $1 [$]$1)
+AC_SUBST(EXTRA_LDFLAGS)

 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SHARED_OPTS version: 53 updated: 2008/10/25 18:14:20
+dnl CF_SHARED_OPTS version: 62 updated: 2010/03/28 16:12:30

 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared


@@ -4228,12 +4570,15 @@ dnl Some loaders leave 'so_locations' lying around.  It's nice to clean up.
 AC_DEFUN([CF_SHARED_OPTS],
 [
        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
 AC_DEFUN([CF_SHARED_OPTS],
 [
        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])

+       AC_REQUIRE([CF_LD_RPATH_OPT])

        LOCAL_LDFLAGS=
        LOCAL_LDFLAGS2=
        LD_SHARED_OPTS=
        INSTALL_LIB="-m 644"
 
        cf_cv_do_symlinks=no
        LOCAL_LDFLAGS=
        LOCAL_LDFLAGS2=
        LD_SHARED_OPTS=
        INSTALL_LIB="-m 644"
 
        cf_cv_do_symlinks=no

+       cf_ld_rpath_opt=
+       test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"

 
        AC_MSG_CHECKING(if release/abi version should be used for shared libs)
        AC_ARG_WITH(shlib-version,
 
        AC_MSG_CHECKING(if release/abi version should be used for shared libs)
        AC_ARG_WITH(shlib-version,


@@ -4272,11 +4617,17 @@ AC_DEFUN([CF_SHARED_OPTS],
 
        cf_cv_shlib_version_infix=no
 
 
        cf_cv_shlib_version_infix=no
 

-       case $cf_cv_system_name in
-       beos*)
+       case $cf_cv_system_name in #(vi
+       aix[[56]]*) #(vi
+               if test "$GCC" = yes; then
+                       CC_SHARED_OPTS=
+                       MK_SHARED_LIB="$(CC) -shared"
+               fi
+               ;;
+       beos*) #(vi

                MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
                ;;
                MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
                ;;

-       cygwin*)
+       cygwin*) #(vi

                CC_SHARED_OPTS=
                MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
                cf_cv_shlib_version=cygdll
                CC_SHARED_OPTS=
                MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
                cf_cv_shlib_version=cygdll


@@ -4293,9 +4644,9 @@ AC_DEFUN([CF_SHARED_OPTS],
 EOF
                exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
 CF_EOF
 EOF
                exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
 CF_EOF

-               chmod +x mk_shared_lib.sh 
+               chmod +x mk_shared_lib.sh

                ;;
                ;;

-       darwin*)
+       darwin*) #(vi

                EXTRA_CFLAGS="-no-cpp-precomp"
                CC_SHARED_OPTS="-dynamic"
                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
                EXTRA_CFLAGS="-no-cpp-precomp"
                CC_SHARED_OPTS="-dynamic"
                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'


@@ -4310,7 +4661,7 @@ CF_EOF
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;

-       hpux*)
+       hpux*) #(vi

                # (tested with gcc 2.7.2 -- I don't have c89)
                if test "$GCC" = yes; then
                        LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}'
                # (tested with gcc 2.7.2 -- I don't have c89)
                if test "$GCC" = yes; then
                        LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}'


@@ -4323,15 +4674,9 @@ CF_EOF
                # readonly to exploit a quirk in the memory manager.
                INSTALL_LIB="-m 555"
                ;;
                # readonly to exploit a quirk in the memory manager.
                INSTALL_LIB="-m 555"
                ;;

-       irix*)
-               if test "$cf_cv_ld_rpath" = yes ; then
-                       if test "$GCC" = yes; then
-                               cf_ld_rpath_opt="-Wl,-rpath,"
-                               EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
-                       else
-                               cf_ld_rpath_opt="-rpath "
-                               EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
-                       fi
+       irix*) #(vi
+               if test "$cf_cv_enable_rpath" = yes ; then
+                       EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"

                fi
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then
                fi
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then


@@ -4342,54 +4687,50 @@ CF_EOF
                fi
                cf_cv_rm_so_locs=yes
                ;;
                fi
                cf_cv_rm_so_locs=yes
                ;;

-       linux*|gnu*|k*bsd*-gnu)
+       linux*|gnu*|k*bsd*-gnu) #(vi

                if test "$DFT_LWR_MODEL" = "shared" ; then
                if test "$DFT_LWR_MODEL" = "shared" ; then

-                       LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+                       LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"

                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
                        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"
+               if test "$cf_cv_enable_rpath" = yes ; then
+                       EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"

                fi
                CF_SHARED_SONAME
                MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
                fi
                CF_SHARED_SONAME
                MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;

-       openbsd[[2-9]].*)
+       openbsd[[2-9]].*) #(vi

                if test "$DFT_LWR_MODEL" = "shared" ; then
                if test "$DFT_LWR_MODEL" = "shared" ; then

-                       LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+                       LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"

                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
                        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"
+               if test "$cf_cv_enable_rpath" = yes ; then
+                       EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"

                fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CF_SHARED_SONAME
                fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CF_SHARED_SONAME

-               MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'

                ;;
                ;;

-       nto-qnx*|openbsd*|freebsd[[12]].*)
+       nto-qnx*|openbsd*|freebsd[[12]].*) #(vi

                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;

-       freebsd*)
+       freebsd*) #(vi

                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"

-               if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
-                       LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
-                       LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
-                       cf_ld_rpath_opt="-rpath "
-                       EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
+               if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
+                       LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
+                       LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS"
+                       EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"

                fi
                CF_SHARED_SONAME
                fi
                CF_SHARED_SONAME

-               MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $[@]` -o $[@]'
+               MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'

                ;;
                ;;

-       netbsd*)
+       netbsd*) #(vi

                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"

-               test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
-               if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
-                       LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+               if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
+                       LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"

                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"

-                       EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+                       EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS"

                        if test "$cf_cv_shlib_version" = auto; then
                        if test -f /usr/libexec/ld.elf_so; then
                                cf_cv_shlib_version=abi
                        if test "$cf_cv_shlib_version" = auto; then
                        if test -f /usr/libexec/ld.elf_so; then
                                cf_cv_shlib_version=abi


@@ -4400,37 +4741,33 @@ CF_EOF
                        CF_SHARED_SONAME
                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
                else
                        CF_SHARED_SONAME
                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
                else

-                       MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
+                       MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]'

                fi
                ;;
                fi
                ;;

-       osf*|mls+*)
+       osf*|mls+*) #(vi

                # tested with OSF/1 V3.2 and 'cc'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
                # tested with OSF/1 V3.2 and 'cc'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'

-               case $host_os in
+               case $host_os in #(vi

                osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;
                esac
                MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
                if test "$DFT_LWR_MODEL" = "shared" ; then
                osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;
                esac
                MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
                if test "$DFT_LWR_MODEL" = "shared" ; then

-                       LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+                       LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"

                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi

-               if test "$cf_cv_ld_rpath" = yes ; then
-                       cf_ld_rpath_opt="-rpath"
-                       # EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
-               fi

                cf_cv_rm_so_locs=yes
                ;;
                cf_cv_rm_so_locs=yes
                ;;

-       sco3.2v5*)  # (also uw2* and UW7) hops 13-Apr-98
+       sco3.2v5*)  # (also uw2* and UW7: hops 13-Apr-98

                # tested with osr5.0.5
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-belf -KPIC'
                fi
                MK_SHARED_LIB='${LD} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'
                # tested with osr5.0.5
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-belf -KPIC'
                fi
                MK_SHARED_LIB='${LD} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'

-               if test "$cf_cv_ld_rpath" = yes ; then
+               if test "$cf_cv_enable_rpath" = yes ; then

                        # only way is to set LD_RUN_PATH but no switch for it
                        RUN_PATH=$libdir
                fi
                        # only way is to set LD_RUN_PATH but no switch for it
                        RUN_PATH=$libdir
                fi


@@ -4438,7 +4775,7 @@ CF_EOF
                LINK_PROGS='LD_RUN_PATH=${libdir}'
                LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib'
                ;;
                LINK_PROGS='LD_RUN_PATH=${libdir}'
                LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib'
                ;;

-       sunos4*)
+       sunos4*) #(vi

                # tested with SunOS 4.1.1 and gcc 2.7.0
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                # tested with SunOS 4.1.1 and gcc 2.7.0
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'


@@ -4446,26 +4783,32 @@ CF_EOF
                MK_SHARED_LIB='${LD} -assert pure-text -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
                MK_SHARED_LIB='${LD} -assert pure-text -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;

-       solaris2*)
+       solaris2*) #(vi

                # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
                # 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"
                fi
                # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
                # 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"
                fi

-               if test "$cf_cv_ld_rpath" = yes ; then
-                       cf_ld_rpath_opt="-R"
-                       EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
+               if test "$cf_cv_enable_rpath" = yes ; then
+                       EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS"

                fi
                CF_SHARED_SONAME
                if test "$GCC" != yes; then
                fi
                CF_SHARED_SONAME
                if test "$GCC" != yes; then

-                       CC_SHARED_OPTS='-xcode=pic32'
+                       cf_save_CFLAGS="$CFLAGS"
+                       for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
+                       do
+                               CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
+                               AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break])
+                       done
+                       CFLAGS="$cf_save_CFLAGS"
+                       CC_SHARED_OPTS=$cf_shared_opts

                        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
                ;;
                        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*)
+       sysv5uw7*|unix_sv*) #(vi

                # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'


@@ -4482,7 +4825,7 @@ CF_EOF
        case "$cf_cv_shlib_version" in #(vi
        rel|abi)
                case "$MK_SHARED_LIB" in #(vi
        case "$cf_cv_shlib_version" in #(vi
        rel|abi)
                case "$MK_SHARED_LIB" in #(vi

-               *'-o $[@]')
+               *'-o $[@]') #(vi

                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                *)
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                *)


@@ -4493,17 +4836,11 @@ CF_EOF
        esac
 
        if test -n "$cf_ld_rpath_opt" ; then
        esac
 
        if test -n "$cf_ld_rpath_opt" ; then

-               AC_MSG_CHECKING(if we need a space after rpath option)
-               cf_save_LIBS="$LIBS"
-               LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
-               AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
-               LIBS="$cf_save_LIBS"
-               AC_MSG_RESULT($cf_rpath_space)
-               test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "

                MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
        fi
 
        AC_SUBST(CC_SHARED_OPTS)
                MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
        fi
 
        AC_SUBST(CC_SHARED_OPTS)

+       AC_SUBST(LD_RPATH_OPT)

        AC_SUBST(LD_SHARED_OPTS)
        AC_SUBST(MK_SHARED_LIB)
        AC_SUBST(LINK_PROGS)
        AC_SUBST(LD_SHARED_OPTS)
        AC_SUBST(MK_SHARED_LIB)
        AC_SUBST(LINK_PROGS)


@@ -4696,7 +5033,7 @@ if test "$cf_cv_sizechange" != no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SRC_MODULES version: 19 updated: 2008/12/13 16:10:19
+dnl CF_SRC_MODULES version: 20 updated: 2008/12/27 12:30:03

 dnl --------------
 dnl For each parameter, test if the source-directory exists, and if it contains
 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
 dnl --------------
 dnl For each parameter, test if the source-directory exists, and if it contains
 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll


@@ -4786,8 +5123,8 @@ test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
 
 ADA_SUBDIRS=
 if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
 
 ADA_SUBDIRS=
 if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then

-   SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
-   ADA_SUBDIRS="gen src samples"
+       SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
+       ADA_SUBDIRS="gen src samples"

 fi
 
 SUB_MAKEFILES=
 fi
 
 SUB_MAKEFILES=


@@ -4797,15 +5134,15 @@ do
 done
 
 if test -n "$ADA_SUBDIRS"; then
 done
 
 if test -n "$ADA_SUBDIRS"; then

-   for cf_dir in $ADA_SUBDIRS
-   do
-      SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
-   done
-   AC_SUBST(ADA_SUBDIRS)
+       for cf_dir in $ADA_SUBDIRS
+       do
+               SUB_MAKEFILES="$SUB_MAKEFILES Ada95/$cf_dir/Makefile"
+       done
+       AC_SUBST(ADA_SUBDIRS)

 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_STDCPP_LIBRARY version: 5 updated: 2000/08/12 23:18:52
+dnl CF_STDCPP_LIBRARY version: 6 updated: 2009/12/19 13:46:49

 dnl -----------------
 dnl Check for -lstdc++, which is GNU's standard C++ library.
 AC_DEFUN([CF_STDCPP_LIBRARY],
 dnl -----------------
 dnl Check for -lstdc++, which is GNU's standard C++ library.
 AC_DEFUN([CF_STDCPP_LIBRARY],


@@ -4821,7 +5158,7 @@ os2*) #(vi
 esac
 AC_CACHE_CHECK(for library $cf_stdcpp_libname,cf_cv_libstdcpp,[
        cf_save="$LIBS"
 esac
 AC_CACHE_CHECK(for library $cf_stdcpp_libname,cf_cv_libstdcpp,[
        cf_save="$LIBS"

-       LIBS="$LIBS -l$cf_stdcpp_libname"
+       LIBS="-l$cf_stdcpp_libname $LIBS"

 AC_TRY_LINK([
 #include <strstream.h>],[
 char buf[80];
 AC_TRY_LINK([
 #include <strstream.h>],[
 char buf[80];


@@ -4904,14 +5241,15 @@ if test "$ac_cv_header_termios_h" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_SUBDIR_PATH version: 5 updated: 2007/07/29 09:55:12
+dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50

 dnl --------------
 dnl Construct a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl    $2 = the package name
 dnl    $3 = the subdirectory, e.g., bin, include or lib
 AC_DEFUN([CF_SUBDIR_PATH],
 dnl --------------
 dnl Construct a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl    $2 = the package name
 dnl    $3 = the subdirectory, e.g., bin, include or lib
 AC_DEFUN([CF_SUBDIR_PATH],

-[$1=""
+[
+$1=

 
 CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
 CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
 
 CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
 CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)


@@ -5106,7 +5444,7 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_UTF8_LIB version: 5 updated: 2008/10/17 19:37:52
+dnl CF_UTF8_LIB version: 6 updated: 2010/04/21 06:20:50

 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],


@@ -5128,10 +5466,40 @@ if test "$cf_cv_utf8_lib" = "add-on" ; then
        AC_DEFINE(HAVE_LIBUTF8_H)
        CF_ADD_INCDIR($cf_cv_header_path_utf8)
        CF_ADD_LIBDIR($cf_cv_library_path_utf8)
        AC_DEFINE(HAVE_LIBUTF8_H)
        CF_ADD_INCDIR($cf_cv_header_path_utf8)
        CF_ADD_LIBDIR($cf_cv_library_path_utf8)

-       LIBS="-lutf8 $LIBS"
+       LIBS="$cf_cv_library_file_utf8 $LIBS"

 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------

+dnl CF_VA_COPY version: 2 updated: 2010/03/04 05:37:29
+dnl ----------
+dnl check for va_copy, part of stdarg.h
+dnl Also, workaround for glibc's __va_copy, by checking for both.
+AC_DEFUN([CF_VA_COPY],[
+AC_CACHE_CHECK(for va_copy, cf_cv_have_va_copy,[
+AC_TRY_LINK([
+#include <stdarg.h>
+],[
+       static va_list dst;
+       static va_list src;
+       va_copy(dst, src)],
+       cf_cv_have_va_copy=yes,
+       cf_cv_have_va_copy=no)])
+
+test "$cf_cv_have_va_copy" = yes && AC_DEFINE(HAVE_VA_COPY)
+
+AC_CACHE_CHECK(for __va_copy, cf_cv_have___va_copy,[
+AC_TRY_LINK([
+#include <stdarg.h>
+],[
+       static va_list dst;
+       static va_list src;
+       __va_copy(dst, src)],
+       cf_cv_have___va_copy=yes,
+       cf_cv_have___va_copy=no)])
+
+test "$cf_cv_have___va_copy" = yes && AC_DEFINE(HAVE___VA_COPY)
+])
+dnl ---------------------------------------------------------------------------

 dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
 dnl ----------
 dnl Use AC_VERBOSE w/o the warnings
 dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
 dnl ----------
 dnl Use AC_VERBOSE w/o the warnings


@@ -5299,7 +5667,7 @@ if test "$with_gpm" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
+dnl CF_WITH_LIBTOOL version: 25 updated: 2010/05/15 15:45:59

 dnl ---------------
 dnl Provide a configure option to incorporate libtool.  Define several useful
 dnl symbols for the makefile rules.
 dnl ---------------
 dnl Provide a configure option to incorporate libtool.  Define several useful
 dnl symbols for the makefile rules.


@@ -5319,22 +5687,23 @@ dnl     elif test ! -f $ACLOCAL/libtool.m4 ; then
 dnl            echo cannot find libtool.m4 file
 dnl            exit 1
 dnl    fi
 dnl            echo cannot find libtool.m4 file
 dnl            exit 1
 dnl    fi

-dnl    
+dnl

 dnl    LOCAL=aclocal.m4
 dnl    ORIG=aclocal.m4.orig
 dnl    LOCAL=aclocal.m4
 dnl    ORIG=aclocal.m4.orig

-dnl    
+dnl

 dnl    trap "mv $ORIG $LOCAL" 0 1 2 5 15
 dnl    rm -f $ORIG
 dnl    mv $LOCAL $ORIG
 dnl    trap "mv $ORIG $LOCAL" 0 1 2 5 15
 dnl    rm -f $ORIG
 dnl    mv $LOCAL $ORIG

-dnl    
+dnl

 dnl    # sed the LIBTOOL= assignment to omit the current directory?
 dnl    sed -e 's/^LIBTOOL=.*/LIBTOOL=${LIBTOOL-libtool}/' $ACLOCAL/libtool.m4 >>$LOCAL
 dnl    cat $ORIG >>$LOCAL
 dnl    # sed the LIBTOOL= assignment to omit the current directory?
 dnl    sed -e 's/^LIBTOOL=.*/LIBTOOL=${LIBTOOL-libtool}/' $ACLOCAL/libtool.m4 >>$LOCAL
 dnl    cat $ORIG >>$LOCAL

-dnl    
+dnl

 dnl    autoconf-257 $*
 dnl
 AC_DEFUN([CF_WITH_LIBTOOL],
 [
 dnl    autoconf-257 $*
 dnl
 AC_DEFUN([CF_WITH_LIBTOOL],
 [

+AC_REQUIRE([CF_DISABLE_LIBTOOL_VERSION])

 ifdef([AC_PROG_LIBTOOL],,[
 LIBTOOL=
 ])
 ifdef([AC_PROG_LIBTOOL],,[
 LIBTOOL=
 ])


@@ -5364,17 +5733,17 @@ ifdef([AC_PROG_LIBTOOL],[
        AC_PROG_LIBTOOL
        # missing_content_AC_PROG_LIBTOOL}}
 ],[
        AC_PROG_LIBTOOL
        # missing_content_AC_PROG_LIBTOOL}}
 ],[

-       if test "$with_libtool" != "yes" ; then
+       if test "$with_libtool" != "yes" ; then

                CF_PATH_SYNTAX(with_libtool)
                LIBTOOL=$with_libtool
        else
                CF_PATH_SYNTAX(with_libtool)
                LIBTOOL=$with_libtool
        else

-               AC_PATH_PROG(LIBTOOL,libtool)
-       fi
-       if test -z "$LIBTOOL" ; then
-               AC_MSG_ERROR(Cannot find libtool)
-       fi
+               AC_PATH_PROG(LIBTOOL,libtool)
+       fi
+       if test -z "$LIBTOOL" ; then
+               AC_MSG_ERROR(Cannot find libtool)
+       fi

 ])dnl
 ])dnl

-       LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+       LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'

        LIB_OBJECT='${OBJECTS:.o=.lo}'
        LIB_SUFFIX=.la
        LIB_CLEAN='${LIBTOOL} --mode=clean'
        LIB_OBJECT='${OBJECTS:.o=.lo}'
        LIB_SUFFIX=.la
        LIB_CLEAN='${LIBTOOL} --mode=clean'


@@ -5389,16 +5758,25 @@ ifdef([AC_PROG_LIBTOOL],[
 
        # Save the version in a cache variable - this is not entirely a good
        # thing, but the version string from libtool is very ugly, and for
 
        # Save the version in a cache variable - this is not entirely a good
        # thing, but the version string from libtool is very ugly, and for

-       # bug reports it might be useful to have the original string.
+       # bug reports it might be useful to have the original string. "("

        cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
        AC_MSG_RESULT($cf_cv_libtool_version)
        if test -z "$cf_cv_libtool_version" ; then
                AC_MSG_ERROR(This is not GNU libtool)
        fi
 
        cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
        AC_MSG_RESULT($cf_cv_libtool_version)
        if test -z "$cf_cv_libtool_version" ; then
                AC_MSG_ERROR(This is not GNU libtool)
        fi
 

+       # special hack to add -no-undefined (which libtool should do for itself)
+       LT_UNDEF=
+       case "$cf_cv_system_name" in #(vi
+       cygwin*|mingw32*|uwin*|aix[[456]]) #(vi
+               LT_UNDEF=-no-undefined
+               ;;
+       esac
+       AC_SUBST([LT_UNDEF])
+

        # special hack to add --tag option for C++ compiler
        # special hack to add --tag option for C++ compiler

-       case $cf_cv_libtool_version in
-       1.[[5-9]]*|[[2-9]]*)
+       case $cf_cv_libtool_version in #(vi
+       1.[[5-9]]*|[[2-9]].[[0-9.a-z]]*) #(vi

                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
                LIBTOOL="$LIBTOOL --tag=CC"
                ;;
                LIBTOOL_CXX="$LIBTOOL --tag=CXX"
                LIBTOOL="$LIBTOOL --tag=CC"
                ;;


@@ -5451,7 +5829,7 @@ $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_WITH_PATHLIST version: 5 updated: 2001/12/10 01:28:30
+dnl CF_WITH_PATHLIST version: 6 updated: 2009/01/11 20:30:23

 dnl ----------------
 dnl Process an option specifying a list of colon-separated paths.
 dnl
 dnl ----------------
 dnl Process an option specifying a list of colon-separated paths.
 dnl


@@ -5467,7 +5845,7 @@ AC_REQUIRE([CF_PATHSEP])
 AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
 ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl
 
 AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
 ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl
 

-IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
+IFS="${IFS=    }"; ac_save_ifs="$IFS"; IFS="${PATH_SEPARATOR}"

 cf_dst_path=
 for cf_src_path in $withval
 do
 cf_dst_path=
 for cf_src_path in $withval
 do


@@ -5593,7 +5971,7 @@ CF_NO_LEAKS_OPTION(valgrind,
        [USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------
        [USE_VALGRIND])
 ])dnl
 dnl ---------------------------------------------------------------------------

-dnl CF_XOPEN_SOURCE version: 27 updated: 2008/12/13 14:08:40
+dnl CF_XOPEN_SOURCE version: 33 updated: 2010/03/28 15:35:52

 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,
 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,


@@ -5604,14 +5982,19 @@ dnl     $1 is the nominal value for _XOPEN_SOURCE
 dnl    $2 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_XOPEN_SOURCE],[
 
 dnl    $2 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_XOPEN_SOURCE],[
 

-AC_REQUIRE([CF_PROG_CC_U_D])
-

 cf_XOPEN_SOURCE=ifelse($1,,500,$1)
 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
 cf_XOPEN_SOURCE=ifelse($1,,500,$1)
 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)

+cf_xopen_source=

 
 case $host_os in #(vi
 
 case $host_os in #(vi

-aix[[45]]*) #(vi
-       CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
+aix[[456]]*) #(vi
+       cf_xopen_source="-D_ALL_SOURCE"
+       ;;
+darwin[[0-8]].*) #(vi
+       cf_xopen_source="-D_APPLE_C_SOURCE"
+       ;;
+darwin*) #(vi
+       cf_xopen_source="-D_DARWIN_C_SOURCE"

        ;;
 freebsd*|dragonfly*) #(vi
        # 5.x headers associate
        ;;
 freebsd*|dragonfly*) #(vi
        # 5.x headers associate


@@ -5619,13 +6002,16 @@ freebsd*|dragonfly*) #(vi
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
        cf_POSIX_C_SOURCE=200112L
        cf_XOPEN_SOURCE=600
        #       _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
        cf_POSIX_C_SOURCE=200112L
        cf_XOPEN_SOURCE=600

-       CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+       cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+       ;;
+hpux11*) #(vi
+       cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500"

        ;;
 hpux*) #(vi
        ;;
 hpux*) #(vi

-       CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+       cf_xopen_source="-D_HPUX_SOURCE"

        ;;
 irix[[56]].*) #(vi
        ;;
 irix[[56]].*) #(vi

-       CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
+       cf_xopen_source="-D_SGI_SOURCE"

        ;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
        CF_GNU_SOURCE
        ;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
        CF_GNU_SOURCE


@@ -5640,16 +6026,19 @@ openbsd*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
 osf[[45]]*) #(vi
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
 osf[[45]]*) #(vi

-       CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE"
+       cf_xopen_source="-D_OSF_SOURCE"

        ;;
 nto-qnx*) #(vi
        ;;
 nto-qnx*) #(vi

-       CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE"
+       cf_xopen_source="-D_QNX_SOURCE"

        ;;
 sco*) #(vi
        # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
        ;;
        ;;
 sco*) #(vi
        # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
        ;;

-solaris*) #(vi
-       CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+solaris2.1[[0-9]]) #(vi
+       cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+       ;;
+solaris2.[[1-9]]) #(vi
+       cf_xopen_source="-D__EXTENSIONS__"

        ;;
 *)
        AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[
        ;;
 *)
        AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[


@@ -5672,11 +6061,14 @@ make an error
        if test "$cf_cv_xopen_source" != no ; then
                CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)
        if test "$cf_cv_xopen_source" != no ; then
                CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE)
                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE)

-               test "$cf_cv_cc_u_d_options" = yes && \
-                       CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
-               CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source"
+               cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source"
+               CF_ADD_CFLAGS($cf_temp_xopen_source)

        fi
        CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
        ;;
 esac
        fi
        CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
        ;;
 esac

+
+if test -n "$cf_xopen_source" ; then
+       CF_ADD_CFLAGS($cf_xopen_source)
+fi

 ])
 ])