Subject: pkg/10849: libwmf pkg depends on specific version of autoconf
To: None <gnats-bugs@gnats.netbsd.org>
From: Johan Danielsson <joda@pdc.kth.se>
List: netbsd-bugs
Date: 08/17/2000 13:02:09
>Number: 10849
>Category: pkg
>Synopsis: libwmf pkg depends on specific version of autoconf
>Confidential: no
>Severity: critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Thu Aug 17 04:05:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Johan Danielsson
>Release: <NetBSD-current source date>
>Organization:
<organization of PR author (multiple lines)>
>Environment:
<machine, os, target, libraries (multiple lines)>
System: NetBSD blubb.pdc.kth.se 1.5B NetBSD 1.5B (BLUBB) #247: Mon Jul 10 13:56:19 CEST 2000 joda@blubb.pdc.kth.se:/usr/misc/src/netbsd/netbsd-cvs/src/sys/arch/i386/compile/BLUBB i386
>Description:
The graphics/libwmf package BUILD_DEPENDS on autoconf, when it really
requires autoconf 2.13. And since autoconf empirically isn't very
compatible across version numbers, it is probably best to include
patches for configure as well as configure.in.
>How-To-Repeat:
Try to build libwmf with autoconf -current installed.
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libwmf/Makefile,v
retrieving revision 1.13
diff -w -u -r1.13 Makefile
--- Makefile 2000/08/06 14:18:32 1.13
+++ Makefile 2000/08/17 11:01:16
@@ -9,7 +9,6 @@
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.csn.ul.ie/~caolan/docs/libwmf.html
-BUILD_DEPENDS+= autoconf:../../devel/autoconf
DEPENDS+= freetype-lib>=1.3.1:../../graphics/freetype-lib
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= xpm-3.4k:../../graphics/xpm
@@ -30,9 +29,6 @@
INCLUDEDIR= ${PREFIX}/include/libwmf
HTMLDIR= ${PREFIX}/share/doc/html/libwmf
-
-pre-configure:
- cd ${WRKSRC} && autoconf
pre-install:
${INSTALL_DATA_DIR} ${INCLUDEDIR}
Index: files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libwmf/files/patch-sum,v
retrieving revision 1.4
diff -w -u -r1.4 patch-sum
--- files/patch-sum 2000/08/06 14:18:50 1.4
+++ files/patch-sum 2000/08/17 11:01:16
@@ -3,3 +3,4 @@
MD5 (patch-aa) = c6fb8ed89209a6fdaa3ebeccd052543e
MD5 (patch-ab) = 7c5b53a1edc460740c401f797ebaa2b7
MD5 (patch-ac) = 95326ec337fc75a8dd8725c729fd22ff
+MD5 (patch-ad) = 599507e0467c6a82a9fcb965a601ebed
Index: patches/patch-ad
===================================================================
RCS file: patch-ad
diff -N patch-ad
--- /dev/null Thu Aug 17 13:26:34 2000
+++ patches/patch-ad Thu Aug 17 14:01:17 2000
@@ -0,0 +1,1198 @@
+$NetBSD$
+
+--- configure~ Thu Aug 17 12:36:22 2000
++++ configure Thu Aug 17 12:42:55 2000
+@@ -1822,7 +1822,7 @@
+ _SAVE_LDFLAGS=$LDFLAGS
+
+ if test "$TTF_DIR" != "" ; then
+-CFLAGS="-I${TTF_DIR}/include $CFLAGS"
++CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
+ LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
+ fi
+
+@@ -1857,7 +1857,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lttf $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1863 "configure"
+ #include "confdefs.h"
+@@ -1885,81 +1885,41 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- TTF_LIBS="-lttf"
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for TT_Done_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:1893: checking for TT_Done_FreeType in -lttf" >&5
+-ac_lib_var=`echo ttf'_'TT_Done_FreeType | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lnsl $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1901 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char TT_Done_FreeType();
+-
+-int main() {
+-TT_Done_FreeType()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- TTF_LIBS="-lttf -lnsl"
++ TTF_LIBS="-lttf -lintl"
+ else
+ echo "$ac_t""no" 1>&6
+ no_ttf=yes
+ fi
+
+-fi
+-
+ else
+ no_ttf=yes
+ fi
+
+ if test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
+- TTF_CFLAGS="-I${TTF_DIR}/include"
++ TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
+ TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
+ fi
+
+ if test "x$no_ttf" = xyes; then
+ if test "$TTF_DIR" != "" ; then
+- CFLAGS="-I${TTF_DIR} $CFLAGS"
+- LDFLAGS="-L${TTF_DIR} $LDFLAGS"
++ CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
++ LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
+ fi
+
+ if test "$TTF_DIR" = no; then
+ SYSTEM_TTF=0
+ else
+ echo $ac_n "checking "for freetype.h"""... $ac_c" 1>&6
+-echo "configure:1954: checking "for freetype.h"" >&5
++echo "configure:1914: checking "for freetype.h"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 1956 "configure"
++#line 1916 "configure"
+ #include "confdefs.h"
+ #include "freetype.h"
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_TTF=1
+ else
+@@ -1973,15 +1933,15 @@
+ fi
+ if test "$SYSTEM_TTF" = 1 ; then
+ echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:1977: checking for TT_Init_FreeType in -lttf" >&5
++echo "configure:1937: checking for TT_Init_FreeType in -lttf" >&5
+ ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lttf $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1985 "configure"
++#line 1945 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1992,7 +1952,7 @@
+ TT_Init_FreeType()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2007,59 +1967,19 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- TTF_LIBS="-lttf"
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for TT_Done_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:2015: checking for TT_Done_FreeType in -lttf" >&5
+-ac_lib_var=`echo ttf'_'TT_Done_FreeType | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lnsl $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 2023 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char TT_Done_FreeType();
+-
+-int main() {
+-TT_Done_FreeType()
+-; return 0; }
+-EOF
+-if { (eval echo configure:2034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- TTF_LIBS="-lttf -lnsl"
++ TTF_LIBS="-lttf -lintl"
+ else
+ echo "$ac_t""no" 1>&6
+ no_ttf=yes
+ fi
+
+-fi
+-
+ else
+ no_ttf=yes
+ fi
+
+ if test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
+- TTF_CFLAGS="-I${TTF_DIR}"
+- TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
++ TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
++ TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
+ fi
+
+ fi
+@@ -2076,7 +1996,7 @@
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:2080: checking for X" >&5
++echo "configure:2000: checking for X" >&5
+
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -2138,12 +2058,12 @@
+
+ # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 2142 "configure"
++#line 2062 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -2212,14 +2132,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2216 "configure"
++#line 2136 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -2307,7 +2227,7 @@
+
+ ### Check for the pt library (for SCO, needed for X)
+ echo $ac_n "checking for ptsname in -lpt""... $ac_c" 1>&6
+-echo "configure:2311: checking for ptsname in -lpt" >&5
++echo "configure:2231: checking for ptsname in -lpt" >&5
+ ac_lib_var=`echo pt'_'ptsname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2315,7 +2235,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lpt $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2319 "configure"
++#line 2239 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2326,7 +2246,7 @@
+ ptsname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2367,17 +2287,17 @@
+ case "`(uname -sr) 2>/dev/null`" in
+ "SunOS 5"*)
+ echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+-echo "configure:2371: checking whether -R must be followed by a space" >&5
++echo "configure:2291: checking whether -R must be followed by a space" >&5
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+ cat > conftest.$ac_ext <<EOF
+-#line 2374 "configure"
++#line 2294 "configure"
+ #include "confdefs.h"
+
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_nospace=yes
+ else
+@@ -2393,14 +2313,14 @@
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat > conftest.$ac_ext <<EOF
+-#line 2397 "configure"
++#line 2317 "configure"
+ #include "confdefs.h"
+
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_space=yes
+ else
+@@ -2432,7 +2352,7 @@
+ # libraries were built with DECnet support. And karl@cs.umb.edu says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:2436: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:2356: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2440,7 +2360,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldnet $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2444 "configure"
++#line 2364 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2451,7 +2371,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2473,7 +2393,7 @@
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:2477: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:2397: checking for dnet_ntoa in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2481,7 +2401,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2485 "configure"
++#line 2405 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2492,7 +2412,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2521,12 +2441,12 @@
+ # The nsl library prevents programs from opening the X display
+ # on Irix 5.2, according to dickey@clark.net.
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:2525: checking for gethostbyname" >&5
++echo "configure:2445: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2530 "configure"
++#line 2450 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname(); below. */
+@@ -2549,7 +2469,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_gethostbyname=yes"
+ else
+@@ -2570,7 +2490,7 @@
+
+ if test $ac_cv_func_gethostbyname = no; then
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:2574: checking for gethostbyname in -lnsl" >&5
++echo "configure:2494: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2578,7 +2498,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lnsl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2582 "configure"
++#line 2502 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2589,7 +2509,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2619,12 +2539,12 @@
+ # -lsocket must be given before -lnsl if both are needed.
+ # We assume that if connect needs -lnsl, so does gethostbyname.
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:2623: checking for connect" >&5
++echo "configure:2543: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2628 "configure"
++#line 2548 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect(); below. */
+@@ -2647,7 +2567,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_connect=yes"
+ else
+@@ -2668,7 +2588,7 @@
+
+ if test $ac_cv_func_connect = no; then
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:2672: checking for connect in -lsocket" >&5
++echo "configure:2592: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2676,7 +2596,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2680 "configure"
++#line 2600 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2687,7 +2607,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2711,12 +2631,12 @@
+
+ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+ echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:2715: checking for remove" >&5
++echo "configure:2635: checking for remove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2720 "configure"
++#line 2640 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove(); below. */
+@@ -2739,7 +2659,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_remove=yes"
+ else
+@@ -2760,7 +2680,7 @@
+
+ if test $ac_cv_func_remove = no; then
+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:2764: checking for remove in -lposix" >&5
++echo "configure:2684: checking for remove in -lposix" >&5
+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2768,7 +2688,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lposix $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2772 "configure"
++#line 2692 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2779,7 +2699,7 @@
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2803,12 +2723,12 @@
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:2807: checking for shmat" >&5
++echo "configure:2727: checking for shmat" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2812 "configure"
++#line 2732 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat(); below. */
+@@ -2831,7 +2751,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_shmat=yes"
+ else
+@@ -2852,7 +2772,7 @@
+
+ if test $ac_cv_func_shmat = no; then
+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:2856: checking for shmat in -lipc" >&5
++echo "configure:2776: checking for shmat in -lipc" >&5
+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2860,7 +2780,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lipc $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2864 "configure"
++#line 2784 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2871,7 +2791,7 @@
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2904,7 +2824,7 @@
+ # libraries we check for below, so use a different variable.
+ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+ echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:2908: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:2828: checking for IceConnectionNumber in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2912,7 +2832,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2916 "configure"
++#line 2836 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2923,7 +2843,7 @@
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2948,12 +2868,12 @@
+ fi
+
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:2952: checking for ANSI C header files" >&5
++echo "configure:2872: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2957 "configure"
++#line 2877 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -2961,7 +2881,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -2978,7 +2898,7 @@
+ if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 2982 "configure"
++#line 2902 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -2996,7 +2916,7 @@
+ if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 3000 "configure"
++#line 2920 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3017,7 +2937,7 @@
+ :
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3021 "configure"
++#line 2941 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -3028,7 +2948,7 @@
+ exit (0); }
+
+ EOF
+-if { (eval echo configure:3032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ :
+ else
+@@ -3056,17 +2976,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3060: checking for $ac_hdr" >&5
++echo "configure:2980: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3065 "configure"
++#line 2985 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -3116,16 +3036,16 @@
+ SYSTEM_XPM=0
+ else
+ echo $ac_n "checking "for xpm.h"""... $ac_c" 1>&6
+-echo "configure:3120: checking "for xpm.h"" >&5
++echo "configure:3040: checking "for xpm.h"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3122 "configure"
++#line 3042 "configure"
+ #include "confdefs.h"
+ #include <X11/xpm.h>
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_XPM=1
+ else
+@@ -3137,14 +3057,14 @@
+ rm -f conftest*
+ if test "$SYSTEM_XPM" = 0; then
+ cat > conftest.$ac_ext <<EOF
+-#line 3141 "configure"
++#line 3061 "configure"
+ #include "confdefs.h"
+ #include <xpm.h>
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_XPM=1
+ else
+@@ -3162,7 +3082,7 @@
+ fi
+ if test "$SYSTEM_XPM" = 1 ; then
+ echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6
+-echo "configure:3166: checking for main in -lXpm" >&5
++echo "configure:3086: checking for main in -lXpm" >&5
+ ac_lib_var=`echo Xpm'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3170,14 +3090,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lXpm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3174 "configure"
++#line 3094 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3218,16 +3138,16 @@
+ SYSTEM_XPM=0
+ else
+ echo $ac_n "checking "for xpm.h"""... $ac_c" 1>&6
+-echo "configure:3222: checking "for xpm.h"" >&5
++echo "configure:3142: checking "for xpm.h"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3224 "configure"
++#line 3144 "configure"
+ #include "confdefs.h"
+ #include <X11/xpm.h>
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_XPM=1
+ else
+@@ -3239,14 +3159,14 @@
+ rm -f conftest*
+ if test "$SYSTEM_XPM" = 0; then
+ cat > conftest.$ac_ext <<EOF
+-#line 3243 "configure"
++#line 3163 "configure"
+ #include "confdefs.h"
+ #include <xpm.h>
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_XPM=1
+ else
+@@ -3264,7 +3184,7 @@
+ fi
+ if test "$SYSTEM_XPM" = 1 ; then
+ echo $ac_n "checking for main in -lXpm""... $ac_c" 1>&6
+-echo "configure:3268: checking for main in -lXpm" >&5
++echo "configure:3188: checking for main in -lXpm" >&5
+ ac_lib_var=`echo Xpm'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3272,14 +3192,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lXpm -lX11 $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3276 "configure"
++#line 3196 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3330,16 +3250,16 @@
+ SYSTEM_ZLIB=
+ else
+ echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
+-echo "configure:3334: checking "for zlib.h"" >&5
++echo "configure:3254: checking "for zlib.h"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3336 "configure"
++#line 3256 "configure"
+ #include "confdefs.h"
+ #include "zlib.h"
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_ZLIB=1
+ else
+@@ -3359,7 +3279,7 @@
+ LDFLAGS="-L/usr/lib $LDFLAGS"
+
+ echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
+-echo "configure:3363: checking for gzread in -lz" >&5
++echo "configure:3283: checking for gzread in -lz" >&5
+ ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3367,7 +3287,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3371 "configure"
++#line 3291 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3378,7 +3298,7 @@
+ gzread()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3403,7 +3323,7 @@
+
+ if test "$SYSTEM_ZLIB" = "" ; then
+ echo $ac_n "checking for gzread in -lgz""... $ac_c" 1>&6
+-echo "configure:3407: checking for gzread in -lgz" >&5
++echo "configure:3327: checking for gzread in -lgz" >&5
+ ac_lib_var=`echo gz'_'gzread | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3411,7 +3331,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lgz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3415 "configure"
++#line 3335 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3422,7 +3342,7 @@
+ gzread()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3458,16 +3378,16 @@
+ SYSTEM_ZLIB=
+ else
+ echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
+-echo "configure:3462: checking "for zlib.h"" >&5
++echo "configure:3382: checking "for zlib.h"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3464 "configure"
++#line 3384 "configure"
+ #include "confdefs.h"
+ #include "zlib.h"
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_ZLIB=1
+ else
+@@ -3487,7 +3407,7 @@
+ LDFLAGS="-L/usr/lib $LDFLAGS"
+
+ echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
+-echo "configure:3491: checking for gzread in -lz" >&5
++echo "configure:3411: checking for gzread in -lz" >&5
+ ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3495,7 +3415,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3499 "configure"
++#line 3419 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3506,7 +3426,7 @@
+ gzread()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3531,7 +3451,7 @@
+
+ if test "$SYSTEM_ZLIB" = "" ; then
+ echo $ac_n "checking for gzread in -lgz""... $ac_c" 1>&6
+-echo "configure:3535: checking for gzread in -lgz" >&5
++echo "configure:3455: checking for gzread in -lgz" >&5
+ ac_lib_var=`echo gz'_'gzread | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3539,7 +3459,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lgz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3543 "configure"
++#line 3463 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3550,7 +3470,7 @@
+ gzread()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3603,22 +3523,22 @@
+ if test "$with_png" != 'no'; then
+
+ echo "checking for PNG support ..." 1>&6
+-echo "configure:3607: checking for PNG support ..." >&5
++echo "configure:3527: checking for PNG support ..." >&5
+ failed=0;
+ passed=0;
+ ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for png.h""... $ac_c" 1>&6
+-echo "configure:3612: checking for png.h" >&5
++echo "configure:3532: checking for png.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3617 "configure"
++#line 3537 "configure"
+ #include "confdefs.h"
+ #include <png.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -3642,17 +3562,17 @@
+
+ ac_safe=`echo "pngconf.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for pngconf.h""... $ac_c" 1>&6
+-echo "configure:3646: checking for pngconf.h" >&5
++echo "configure:3566: checking for pngconf.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3651 "configure"
++#line 3571 "configure"
+ #include "confdefs.h"
+ #include <pngconf.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -3675,7 +3595,7 @@
+ fi
+
+ echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6
+-echo "configure:3679: checking for png_info_init in -lpng" >&5
++echo "configure:3599: checking for png_info_init in -lpng" >&5
+ ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3683,7 +3603,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lpng $ZLIB_LIBS -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3687 "configure"
++#line 3607 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3694,7 +3614,7 @@
+ png_info_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3716,7 +3636,7 @@
+ fi
+
+ echo $ac_n "checking if PNG package is complete""... $ac_c" 1>&6
+-echo "configure:3720: checking if PNG package is complete" >&5
++echo "configure:3640: checking if PNG package is complete" >&5
+ if test $passed -gt 0; then
+ if test $failed -gt 0; then
+ echo "$ac_t""no -- some components failed test" 1>&6
+@@ -3756,16 +3676,16 @@
+ SYSTEM_TTF=0
+ else
+ echo $ac_n "checking "for freetype.h"""... $ac_c" 1>&6
+-echo "configure:3760: checking "for freetype.h"" >&5
++echo "configure:3680: checking "for freetype.h"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3762 "configure"
++#line 3682 "configure"
+ #include "confdefs.h"
+ #include "freetype.h"
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_TTF=1
+ else
+@@ -3777,15 +3697,15 @@
+ fi
+ if test "$SYSTEM_TTF" = 1 ; then
+ echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:3781: checking for TT_Init_FreeType in -lttf" >&5
++echo "configure:3701: checking for TT_Init_FreeType in -lttf" >&5
+ ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lm $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3789 "configure"
++#line 3709 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3796,7 +3716,7 @@
+ TT_Init_FreeType()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3811,7 +3731,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- TTF_LIBS="-lttf"
++ TTF_LIBS="-lttf -lintl"
+ else
+ echo "$ac_t""no" 1>&6
+ no_ttf=yes
+@@ -3822,30 +3742,30 @@
+ fi
+
+ if test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
+- TTF_CFLAGS="-I${TTF_DIR}/include"
++ TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
+ TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
+ fi
+
+ if test "x$no_ttf" = xyes; then
+ if test "$TTF_DIR" != "" ; then
+- CFLAGS="-I${TTF_DIR} $CFLAGS"
+- LDFLAGS="-L${TTF_DIR} $LDFLAGS"
++ CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
++ LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
+ fi
+
+ if test "$TTF_DIR" = no; then
+ SYSTEM_TTF=0
+ else
+ echo $ac_n "checking "for freetype.h"""... $ac_c" 1>&6
+-echo "configure:3840: checking "for freetype.h"" >&5
++echo "configure:3760: checking "for freetype.h"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3842 "configure"
++#line 3762 "configure"
+ #include "confdefs.h"
+ #include "freetype.h"
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ result="yes" SYSTEM_TTF=1
+ else
+@@ -3859,15 +3779,15 @@
+ fi
+ if test "$SYSTEM_TTF" = 1 ; then
+ echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
+-echo "configure:3863: checking for TT_Init_FreeType in -lttf" >&5
++echo "configure:3783: checking for TT_Init_FreeType in -lttf" >&5
+ ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lttf -lm $LIBS"
++LIBS="-lttf -lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3871 "configure"
++#line 3791 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3878,7 +3798,7 @@
+ TT_Init_FreeType()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3893,7 +3813,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- TTF_LIBS="-lttf"
++ TTF_LIBS="-lttf -lintl"
+ else
+ echo "$ac_t""no" 1>&6
+ no_ttf=yes
+@@ -3905,8 +3825,8 @@
+
+
+ if test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
+- TTF_CFLAGS="-I${TTF_DIR}"
+- TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
++ TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
++ TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
+ fi
+
+ fi
+@@ -3916,12 +3836,12 @@
+
+
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:3920: checking for working const" >&5
++echo "configure:3840: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3925 "configure"
++#line 3845 "configure"
+ #include "confdefs.h"
+
+ int main() {
+@@ -3970,7 +3890,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_const=yes
+ else
>Release-Note:
>Audit-Trail:
>Unformatted: