$NetBSD: patch-ah,v 1.1 2006/05/22 03:44:55 ben Exp $

--- configure.orig	2005-11-29 08:39:45.000000000 -0800
+++ configure
@@ -853,11 +853,6 @@ Optional Features:
   --enable-htmldir=htmldir
                         Select htmldir
 
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --without-gcc           use CC to compile
-
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1388,18 +1383,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^
 
 
 
-
-# Check whether --with-gcc or --without-gcc was given.
-if test "${with_gcc+set}" = set; then
-  withval="$with_gcc"
-
-fi;
-
-test -n "$CC" && cc_specified=yes
-case ${with_gcc} in
-  yes ) CC=gcc ;;
-  no  ) CC=cc ;;
-  *   ) ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2328,24 +2312,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-;;
-esac
-
-if test "${CC}" = "cc" ; then
-   CFLAGS="${CFLAGS} -w -g -O2 -Aa"
-else
-   CFLAGS="${CFLAGS} -w"
-fi
-
-case "$host" in
-   *-solaris*)
-   LDFLAGS="${LDFLAGS} -lsocket -lnsl"
-   CFLAGS="-DSOLARIS ${CFLAGS}"
-   ;;
-esac
 
-#dnl Checks for programs.
-#AC_PROG_CC
 
 
 
@@ -3166,10 +3133,35 @@ fi
 
 done
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 for ac_header in stdio.h stdlib.h string.h strings.h sys/time.h time.h unistd.h sys/dirent.h \
 		 dirent.h sys/socket.h netdb.h arpa/inet.h sys/types.h netinet/in.h sys/stat.h \
-		 ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h errno.h \
-		 sys/resource.h
+		 ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h sys/resource.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
