3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 --- wget-1.9.1/aclocal.m4~m4macros.patch
7 +++ wget-1.9.1/aclocal.m4
9 dnl Check for `struct utimbuf'.
12 +AH_TEMPLATE([HAVE_STRUCT_UTIMBUF], [Define if we have struct utimbuf])
13 AC_DEFUN([WGET_STRUCT_UTIMBUF],
14 [AC_MSG_CHECKING([for struct utimbuf])
15 if test x"$ac_cv_header_utime_h" = xyes; then
17 dnl it. If socklen_t exists, we use it, else if accept() accepts
18 dnl size_t *, we use that, else we use int.
20 +AH_TEMPLATE([socklen_t], [Set to the appropriate type to use for socklen_t])
21 AC_DEFUN([WGET_SOCKLEN_T], [
22 AC_MSG_CHECKING(for socklen_t)
25 dnl even on those because Apache installs its own fnmatch.h to
26 dnl /usr/local/include (!), which GCC uses before /usr/include.
28 +AH_TEMPLATE([HAVE_WORKING_FNMATCH_H], [Define if we have a working fnmatch.h])
29 AC_DEFUN([WGET_FNMATCH], [
30 AC_MSG_CHECKING([for working fnmatch.h])
31 AC_COMPILE_IFELSE([#include <fnmatch.h>
37 -dnl ansi2knr support: check whether C prototypes are available.
40 -AC_DEFUN(AM_C_PROTOTYPES,
41 -[AC_REQUIRE([AM_PROG_CC_STDC])
42 -AC_BEFORE([$0], [AC_C_INLINE])
43 -AC_MSG_CHECKING([for function prototypes])
44 -if test "$am_cv_prog_cc_stdc" != no; then
46 - AC_DEFINE(PROTOTYPES)
50 - U=_ ANSI2KNR=./ansi2knr
51 - # Ensure some checks needed by ansi2knr itself.
53 - AC_CHECK_HEADERS(string.h)
56 -AC_SUBST(ANSI2KNR)dnl
62 -# @defmac AC_PROG_CC_STDC
63 -# @maindex PROG_CC_STDC
65 -# If the C compiler in not in ANSI C mode by default, try to add an option
66 -# to output variable @code{CC} to make it so. This macro tries various
67 -# options that select ANSI C on some system or another. It considers the
68 -# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
69 -# handles function prototypes correctly.
71 -# If you use this macro, you should check after calling it whether the C
72 -# compiler has been set to accept ANSI C; if not, the shell variable
73 -# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
74 -# code in ANSI C, you can make an un-ANSIfied copy of it by using the
75 -# program @code{ansi2knr}, which comes with Ghostscript.
78 -AC_DEFUN(AM_PROG_CC_STDC,
79 -[AC_REQUIRE([AC_PROG_CC])
80 -AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
81 -AC_CACHE_VAL(am_cv_prog_cc_stdc,
82 -[am_cv_prog_cc_stdc=no
84 -# Don't try gcc -ansi; that turns off useful extensions and
85 -# breaks some systems' header files.
87 -# Ultrix and OSF/1 -std1
88 -# HP-UX -Aa -D_HPUX_SOURCE
89 -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE"
91 - CC="$ac_save_CC $ac_arg"
93 -[#if !defined(__STDC__)
96 -/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
98 -# include <sys/types.h>
99 -# include <sys/stat.h>
102 -int test (int i, double x);
103 -struct s1 {int (*f) (int a);};
104 -struct s2 {int (*f) (double a);};],
105 -[am_cv_prog_cc_stdc="$ac_arg"; break])
109 -AC_MSG_RESULT($am_cv_prog_cc_stdc)
110 -case "x$am_cv_prog_cc_stdc" in
112 - *) CC="$CC $am_cv_prog_cc_stdc" ;;
117 dnl ************************************************************
118 dnl START OF IPv6 AUTOCONFIGURATION SUPPORT MACROS
119 dnl ************************************************************
122 # This code originates from Ulrich Drepper's AM_WITH_NLS.
124 -AC_DEFUN(WGET_WITH_NLS,
125 +AH_TEMPLATE([HAVE_NLS], [Define to enable Native Language Support])
126 +AC_DEFUN([WGET_WITH_NLS],
127 [AC_MSG_CHECKING([whether NLS is requested])
128 dnl Default is enabled NLS
131 dnl This is not strictly an Autoconf macro, because it is run from
132 dnl within `config.status' rather than from within configure. This
133 dnl is why special rules must be applied for it.
134 -AC_DEFUN(WGET_PROCESS_PO,
135 +AC_DEFUN([WGET_PROCESS_PO],
137 dnl I wonder what the following several lines do...
138 if test "x$srcdir" != "x."; then
140 echo "creating po/Makefile"
141 sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
144 -# Search path for a program which passes the given test.
145 -# Ulrich Drepper <drepper@cygnus.com>, 1996.
147 -# This file may be copied and used freely without restrictions. It
148 -# can be used in projects which are not available under the GNU Public
149 -# License but which still want to provide support for the GNU gettext
150 -# functionality. Please note that the actual code is *not* freely
155 -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
156 -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
157 -AC_DEFUN(AM_PATH_PROG_WITH_TEST,
158 -[# Extract the first word of "$2", so it can be a program name with args.
159 -set dummy $2; ac_word=[$]2
160 -AC_MSG_CHECKING([for $ac_word])
161 -AC_CACHE_VAL(ac_cv_path_$1,
164 - ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
167 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
168 - for ac_dir in ifelse([$5], , $PATH, [$5]); do
169 - test -z "$ac_dir" && ac_dir=.
170 - if test -f $ac_dir/$ac_word; then
172 - ac_cv_path_$1="$ac_dir/$ac_word"
178 -dnl If no 4th arg is given, leave the cache variable unset,
179 -dnl so AC_PATH_PROGS will keep looking.
180 -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
185 -if test -n "[$]$1"; then
186 - AC_MSG_RESULT([$]$1)
193 -# Include libtool code.
195 -builtin(include, libtool.m4)dnl