| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | $NetBSD: patch-ab,v 1.5 2012/03/05 07:29:36 dholland Exp $ | | 1 | $NetBSD: patch-ab,v 1.6 2013/07/05 13:46:13 ryoon Exp $ |
2 | | | 2 | |
3 | Caution: the extra cpp checking (the three hunks containing "Should be | | 3 | Caution: the extra cpp checking (the three hunks containing "Should be |
4 | one line") is manually hacked and not reflected in configure.in; do | | 4 | one line") is manually hacked and not reflected in configure.in; do |
5 | not regenerate configure with autoconf without merging it. This | | 5 | not regenerate configure with autoconf without merging it. This |
6 | checking is required because somewhere between gcc 4.1 and 4.5 cpp | | 6 | checking is required because somewhere between gcc 4.1 and 4.5 cpp |
7 | started doing regrettable things with backslash-escaped newlines. | | 7 | started doing regrettable things with backslash-escaped newlines. |
8 | | | 8 | |
9 | --- configure.orig 2000-06-12 20:05:56.000000000 +0000 | | 9 | --- configure.orig 2000-06-12 20:05:56.000000000 +0000 |
10 | +++ configure | | 10 | +++ configure |
11 | @@ -20,6 +20,8 @@ ac_help="$ac_help | | 11 | @@ -20,6 +20,8 @@ ac_help="$ac_help |
12 | ac_help="$ac_help | | 12 | ac_help="$ac_help |
13 | --with-x-toolkit=KIT use an X toolkit (KIT = yes/lucid/athena/motif/no)" | | 13 | --with-x-toolkit=KIT use an X toolkit (KIT = yes/lucid/athena/motif/no)" |
14 | ac_help="$ac_help | | 14 | ac_help="$ac_help |
| @@ -51,85 +51,89 @@ started doing regrettable things with ba | | | @@ -51,85 +51,89 @@ started doing regrettable things with ba |
51 | + arm*-*-netbsd*) machine=arm ;; | | 51 | + arm*-*-netbsd*) machine=arm ;; |
52 | + x86_64-*-netbsd*) machine=amd64 ;; | | 52 | + x86_64-*-netbsd*) machine=amd64 ;; |
53 | esac | | 53 | esac |
54 | ;; | | 54 | ;; |
55 | | | 55 | |
56 | @@ -1519,6 +1532,7 @@ case "${canonical}" in | | 56 | @@ -1519,6 +1532,7 @@ case "${canonical}" in |
57 | *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; | | 57 | *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; |
58 | *-386bsd* ) opsys=386bsd ;; | | 58 | *-386bsd* ) opsys=386bsd ;; |
59 | *-freebsd* ) opsys=freebsd ;; | | 59 | *-freebsd* ) opsys=freebsd ;; |
60 | + *-dragonfly* ) opsys=dragonfly ;; | | 60 | + *-dragonfly* ) opsys=dragonfly ;; |
61 | *-nextstep* ) opsys=nextstep ;; | | 61 | *-nextstep* ) opsys=nextstep ;; |
62 | ## Otherwise, we'll fall through to the generic opsys code at the bottom. | | 62 | ## Otherwise, we'll fall through to the generic opsys code at the bottom. |
63 | esac | | 63 | esac |
64 | @@ -1916,15 +1930,21 @@ else | | 64 | @@ -1916,15 +1930,20 @@ else |
65 | CPP="${CC-cc} -E" | | 65 | CPP="${CC-cc} -E" |
66 | # On the NeXT, cc -E runs the code through the compiler's parser, | | 66 | # On the NeXT, cc -E runs the code through the compiler's parser, |
67 | # not just through cpp. | | 67 | # not just through cpp. |
68 | + # And, gcc 4.5? and up does not preserve escaped newlines, which is | | 68 | + # And, gcc 4.5? and up does not preserve escaped newlines, which is |
69 | + # fatal for preprocessing makefiles. | | 69 | + # fatal for preprocessing makefiles. |
70 | cat > conftest.$ac_ext <<EOF | | 70 | cat > conftest.$ac_ext <<EOF |
71 | #line 1921 "configure" | | 71 | #line 1921 "configure" |
72 | #include "confdefs.h" | | 72 | #include "confdefs.h" |
73 | #include <assert.h> | | 73 | #include <assert.h> |
74 | Syntax Error | | 74 | Syntax Error |
75 | +Should \\ | | 75 | +Should be one line. |
76 | +be one line. | | | |
77 | EOF | | 76 | EOF |
78 | -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | | 77 | -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
79 | +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" | | 78 | +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" |
80 | { (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | | 79 | { (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
81 | -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | | 80 | -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
82 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ | | 81 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ |
83 | + grep -L "Should *be one line" conftest2.out \ | | 82 | + grep -L "Should *be one line" conftest2.out \ |
84 | + ` | | 83 | + ` |
85 | if test -z "$ac_err"; then | | 84 | if test -z "$ac_err"; then |
86 | : | | 85 | : |
87 | else | | 86 | else |
88 | @@ -1938,10 +1958,14 @@ else | | 87 | @@ -1932,16 +1951,19 @@ else |
| | | 88 | echo "configure: failed program was:" >&5 |
| | | 89 | cat conftest.$ac_ext >&5 |
| | | 90 | rm -rf conftest* |
| | | 91 | - CPP="${CC-cc} -E -traditional-cpp" |
| | | 92 | + CPP="${CC-cc} -E" |
| | | 93 | cat > conftest.$ac_ext <<EOF |
| | | 94 | #line 1938 "configure" |
89 | #include "confdefs.h" | | 95 | #include "confdefs.h" |
90 | #include <assert.h> | | 96 | #include <assert.h> |
91 | Syntax Error | | 97 | Syntax Error |
92 | +Should \\ | | 98 | +Should be one line. |
93 | +be one line. | | | |
94 | EOF | | 99 | EOF |
95 | -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | | 100 | -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
96 | +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" | | 101 | +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" |
97 | { (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | | 102 | { (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
98 | -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | | 103 | -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
99 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ | | 104 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ |
100 | + grep -L "Should *be one line" conftest2.out \ | | 105 | + grep -L "Should *be one line" conftest2.out \ |
101 | + ` | | 106 | + ` |
102 | if test -z "$ac_err"; then | | 107 | if test -z "$ac_err"; then |
103 | : | | 108 | : |
104 | else | | 109 | else |
105 | @@ -1955,10 +1979,14 @@ else | | 110 | @@ -1955,10 +1977,13 @@ else |
106 | #include "confdefs.h" | | 111 | #include "confdefs.h" |
107 | #include <assert.h> | | 112 | #include <assert.h> |
108 | Syntax Error | | 113 | Syntax Error |
109 | +Should \\ | | 114 | +Should be one line. |
110 | +be one line. | | | |
111 | EOF | | 115 | EOF |
112 | -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | | 116 | -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
113 | +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" | | 117 | +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out" |
114 | { (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | | 118 | { (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } |
115 | -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | | 119 | -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
116 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ | | 120 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \ |
117 | + grep -L "Should *be one line" conftest2.out \ | | 121 | + grep -L "Should *be one line" conftest2.out \ |
118 | + ` | | 122 | + ` |
119 | if test -z "$ac_err"; then | | 123 | if test -z "$ac_err"; then |
120 | : | | 124 | : |
121 | else | | 125 | else |
122 | @@ -3823,6 +3851,53 @@ else | | 126 | @@ -3823,6 +3848,53 @@ else |
123 | echo "$ac_t""no" 1>&6 | | 127 | echo "$ac_t""no" 1>&6 |
124 | fi | | 128 | fi |
125 | | | 129 | |
126 | + if test x$HAVE_X11XTR6 = xyes; then | | 130 | + if test x$HAVE_X11XTR6 = xyes; then |
127 | + LIBS="$LIBS -lXpm" | | 131 | + LIBS="$LIBS -lXpm" |
128 | + echo $ac_n "checking for XawPixmapsInitialize in -lXaw""... $ac_c" 1>&6 | | 132 | + echo $ac_n "checking for XawPixmapsInitialize in -lXaw""... $ac_c" 1>&6 |
129 | +echo "configure:3842: checking for XawPixmapsInitialize in -lXaw" >&5 | | 133 | +echo "configure:3842: checking for XawPixmapsInitialize in -lXaw" >&5 |
130 | +ac_lib_var=`echo Xaw'_'XawPixmapsInitialize | sed 'y%./+-%__p_%'` | | 134 | +ac_lib_var=`echo Xaw'_'XawPixmapsInitialize | sed 'y%./+-%__p_%'` |
131 | +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | | 135 | +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
132 | + echo $ac_n "(cached) $ac_c" 1>&6 | | 136 | + echo $ac_n "(cached) $ac_c" 1>&6 |
133 | +else | | 137 | +else |
134 | + ac_save_LIBS="$LIBS" | | 138 | + ac_save_LIBS="$LIBS" |
135 | +LIBS="-lXaw $LIBS" | | 139 | +LIBS="-lXaw $LIBS" |
| @@ -163,27 +167,27 @@ started doing regrettable things with ba | | | @@ -163,27 +167,27 @@ started doing regrettable things with ba |
163 | + LIBXPM="-lXpm" | | 167 | + LIBXPM="-lXpm" |
164 | +else | | 168 | +else |
165 | + echo "$ac_t""no" 1>&6 | | 169 | + echo "$ac_t""no" 1>&6 |
166 | + LIBXPM="" | | 170 | + LIBXPM="" |
167 | +fi | | 171 | +fi |
168 | + | | 172 | + |
169 | + else | | 173 | + else |
170 | + LIBXPM="" | | 174 | + LIBXPM="" |
171 | + fi | | 175 | + fi |
172 | + | | 176 | + |
173 | LIBS="$OLDLIBS" | | 177 | LIBS="$OLDLIBS" |
174 | fi | | 178 | fi |
175 | | | 179 | |
176 | @@ -4906,6 +4981,64 @@ EOF | | 180 | @@ -4906,6 +4978,64 @@ EOF |
177 | | | 181 | |
178 | fi | | 182 | fi |
179 | | | 183 | |
180 | +if test "x$with_ipv6" = xyes; then | | 184 | +if test "x$with_ipv6" = xyes; then |
181 | + for ac_func in getaddrinfo | | 185 | + for ac_func in getaddrinfo |
182 | +do | | 186 | +do |
183 | +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | | 187 | +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 |
184 | +echo "configure:4973: checking for $ac_func" >&5 | | 188 | +echo "configure:4973: checking for $ac_func" >&5 |
185 | +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | | 189 | +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then |
186 | + echo $ac_n "(cached) $ac_c" 1>&6 | | 190 | + echo $ac_n "(cached) $ac_c" 1>&6 |
187 | +else | | 191 | +else |
188 | + cat > conftest.$ac_ext <<EOF | | 192 | + cat > conftest.$ac_ext <<EOF |
189 | +#line 4978 "configure" | | 193 | +#line 4978 "configure" |
| @@ -228,21 +232,39 @@ started doing regrettable things with ba | | | @@ -228,21 +232,39 @@ started doing regrettable things with ba |
228 | +#define $ac_tr_func 1 | | 232 | +#define $ac_tr_func 1 |
229 | +EOF | | 233 | +EOF |
230 | + | | 234 | + |
231 | +else | | 235 | +else |
232 | + echo "$ac_t""no" 1>&6 | | 236 | + echo "$ac_t""no" 1>&6 |
233 | +fi | | 237 | +fi |
234 | +done | | 238 | +done |
235 | + | | 239 | + |
236 | +fi | | 240 | +fi |
237 | + | | 241 | + |
238 | # Set up the CFLAGS for real compilation, so we can substitute it. | | 242 | # Set up the CFLAGS for real compilation, so we can substitute it. |
239 | CFLAGS="$REAL_CFLAGS" | | 243 | CFLAGS="$REAL_CFLAGS" |
240 | | | 244 | |
241 | @@ -5211,6 +5344,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g | | 245 | @@ -5211,6 +5345,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g |
242 | s%@INSTALL_DATA@%$INSTALL_DATA%g | | 246 | s%@INSTALL_DATA@%$INSTALL_DATA%g |
243 | s%@YACC@%$YACC%g | | 247 | s%@YACC@%$YACC%g |
244 | s%@SET_MAKE@%$SET_MAKE%g | | 248 | s%@SET_MAKE@%$SET_MAKE%g |
245 | +s%@LIBXPM@%$LIBXPM%g | | 249 | +s%@LIBXPM@%$LIBXPM%g |
246 | s%@ALLOCA@%$ALLOCA%g | | 250 | s%@ALLOCA@%$ALLOCA%g |
247 | s%@version@%$version%g | | 251 | s%@version@%$version%g |
248 | s%@configuration@%$configuration%g | | 252 | s%@configuration@%$configuration%g |
| | | 253 | @@ -5480,7 +5615,7 @@ echo creating lib-src/Makefile |
| | | 254 | sed -e '1,/start of cpp stuff/d'\ |
| | | 255 | -e 's@/\*\*/#\(.*\)$@/* \1 */@' \ |
| | | 256 | < Makefile.c > junk.c |
| | | 257 | - $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ |
| | | 258 | + $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ |
| | | 259 | sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c |
| | | 260 | cat junk1.c junk2.c > Makefile.new |
| | | 261 | rm -f junk.c junk1.c junk2.c |
| | | 262 | @@ -5496,7 +5631,7 @@ echo creating src/Makefile |
| | | 263 | sed -e '1,/start of cpp stuff/d'\ |
| | | 264 | -e 's@/\*\*/#\(.*\)$@/* \1 */@' \ |
| | | 265 | < Makefile.c > junk.c |
| | | 266 | - $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ |
| | | 267 | + $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ |
| | | 268 | sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c |
| | | 269 | cat junk1.c junk2.c > Makefile.new |
| | | 270 | rm -f junk.c junk1.c junk2.c |