summaryrefslogtreecommitdiff
path: root/misc/tmux/patches/patch-configure
blob: 109d5403a20f0276b2932ca7058f18a7cd39b556 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
$NetBSD: patch-configure,v 1.2 2011/10/04 11:55:34 ryoon Exp $

Compatibility for b64_ntop.  SVN Revisions 2565 and 2568.
Add DragonFly support, SVN 2600.

--- configure.orig	2011-07-09 16:12:35.000000000 +0000
+++ configure
@@ -603,6 +603,8 @@ IS_FREEBSD_FALSE
 IS_FREEBSD_TRUE
 IS_LINUX_FALSE
 IS_LINUX_TRUE
+IS_DRAGONFLY_FALSE
+IS_DRAGONFLY_TRUE
 IS_DARWIN_FALSE
 IS_DARWIN_TRUE
 IS_AIX_FALSE
@@ -637,6 +639,8 @@ NO_FORKPTY_TRUE
 NO_IMSG_FALSE
 NO_IMSG_TRUE
 XOPEN_DEFINES
+NO_B64_NTOP_FALSE
+NO_B64_NTOP_TRUE
 IS_GLIBC_FALSE
 IS_GLIBC_TRUE
 IS_SUNCC_FALSE
@@ -1315,11 +1319,9 @@ Configuration:
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
 Installation directories:
-  --prefix=PREFIX
-       install architecture-independent files in PREFIX
+  --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
-  --exec-prefix=EPREFIX
- install architecture-dependent files in EPREFIX
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           [PREFIX]
 
 By default, \`make install' will install all the files in
@@ -1344,8 +1346,7 @@ Fine tuning of the installation director
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR
-          documentation root [DATAROOTDIR/doc/tmux]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/tmux]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1377,26 +1378,18 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-debug
-        create a debug build
-  --enable-static
-       create a static build
+  --enable-debug          create a debug build
+  --enable-static         create a static build
 
 Some influential environment variables:
-  CC
-        C compiler command
-  CFLAGS
-    C compiler flags
-  LDFLAGS
-   linker flags, e.g. -L<lib dir> if you have libraries in a
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  LIBS
-      libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS
-  C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CPP
-       C preprocessor
+  CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2083,32 +2076,26 @@ $as_echo "/* confdefs.h */" > confdefs.h
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
-
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
-
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
-
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_URL "$PACKAGE_URL"
-
 _ACEOF
 
 
@@ -2661,13 +2648,11 @@ fi
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
-
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
 #define VERSION "$VERSION"
-
 _ACEOF
 
 # Some tools Automake needs.
@@ -3839,8 +3824,7 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-$as_echo "#define NO_MINUS_C_MINUS_O 1
-" >>confdefs.h
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
 
 fi
 
@@ -4239,8 +4223,7 @@ fi
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1
-" >>confdefs.h
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -4248,15 +4231,13 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header
-" | $as_tr_sh`
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
 eval as_val=\$$as_ac_Header
    if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-
 _ACEOF
 
 fi
@@ -4284,14 +4265,12 @@ for ac_header in  \
 
 
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header
-" | $as_tr_sh`
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 eval as_val=\$$as_ac_Header
    if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-
 _ACEOF
 
 fi
@@ -4470,7 +4449,6 @@ $as_echo "$ac_cv_lib_rt_clock_gettime" >
 if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBRT 1
-
 _ACEOF
 
   LIBS="-lrt $LIBS"
@@ -4605,119 +4583,83 @@ if test "x$found_curses" = xno; then
     as_fn_error "\"curses not found\"" "$LINENO" 5
 fi
 
-# Look for networking libraries.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing b64_ntop" >&5
-$as_echo_n "checking for library containing b64_ntop... " >&6; }
-if test "${ac_cv_search_b64_ntop+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
+# Check for b64_ntop.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for b64_ntop" >&5
+$as_echo_n "checking for b64_ntop... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char b64_ntop ();
+		#include <sys/types.h>
+		#include <netinet/in.h>
+		#include <resolv.h>
+
 int
 main ()
 {
-return b64_ntop ();
+b64_ntop(NULL, 0, NULL, 0);
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' resolv; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_b64_ntop=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if test "${ac_cv_search_b64_ntop+set}" = set; then :
-  break
-fi
-done
-if test "${ac_cv_search_b64_ntop+set}" = set; then :
-
+if ac_fn_c_try_link "$LINENO"; then :
+  found_b64_ntop=yes
 else
-  ac_cv_search_b64_ntop=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_b64_ntop" >&5
-$as_echo "$ac_cv_search_b64_ntop" >&6; }
-ac_res=$ac_cv_search_b64_ntop
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  found_b64_ntop=no
 
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+if test "x$found_b64_ntop" = xno; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __b64_ntop" >&5
-$as_echo_n "checking for library containing __b64_ntop... " >&6; }
-if test "${ac_cv_search___b64_ntop+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for b64_ntop with -lresolv" >&5
+$as_echo_n "checking for b64_ntop with -lresolv... " >&6; }
+	LIBS="$LIBS -lresolv"
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char __b64_ntop ();
+			#include <sys/types.h>
+			#include <netinet/in.h>
+			#include <resolv.h>
+
 int
 main ()
 {
-return __b64_ntop ();
+b64_ntop(NULL, 0, NULL, 0);
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' resolv; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search___b64_ntop=$ac_res
+if ac_fn_c_try_link "$LINENO"; then :
+  found_b64_ntop=yes
+else
+  found_b64_ntop=no
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if test "${ac_cv_search___b64_ntop+set}" = set; then :
-  break
+    conftest$ac_exeext conftest.$ac_ext
+	if test "x$found_b64_ntop" = xno; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	fi
 fi
-done
-if test "${ac_cv_search___b64_ntop+set}" = set; then :
+if test "x$found_b64_ntop" = xyes; then
+	$as_echo "#define HAVE_B64_NTOP 1" >>confdefs.h
 
-else
-  ac_cv_search___b64_ntop=no
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+ if test "x$found_b64_ntop" = xno; then
+  NO_B64_NTOP_TRUE=
+  NO_B64_NTOP_FALSE='#'
+else
+  NO_B64_NTOP_TRUE='#'
+  NO_B64_NTOP_FALSE=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___b64_ntop" >&5
-$as_echo "$ac_cv_search___b64_ntop" >&6; }
-ac_res=$ac_cv_search___b64_ntop
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-fi
 
+# Look for networking libraries.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
 $as_echo_n "checking for library containing inet_ntoa... " >&6; }
 if test "${ac_cv_search_inet_ntoa+set}" = set; then :
@@ -4869,7 +4811,6 @@ $as_echo "$ac_cv_lib_xnet_socket" >&6; }
 if test "x$ac_cv_lib_xnet_socket" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXNET 1
-
 _ACEOF
 
   LIBS="-lxnet $LIBS"
@@ -5053,8 +4994,7 @@ else
 fi
 
 if test "x$found_imsg_init" = xyes; then
-	$as_echo "#define HAVE_IMSG 1
-" >>confdefs.h
+	$as_echo "#define HAVE_IMSG 1" >>confdefs.h
 
 fi
  if test "x$found_imsg_init" = xno; then
@@ -5126,8 +5066,7 @@ else
 fi
 
 if test "x$found_forkpty" = xyes; then
-	$as_echo "#define HAVE_FORKPTY 1
-" >>confdefs.h
+	$as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
 
 fi
  if test "x$found_forkpty" = xno; then
@@ -5148,8 +5087,7 @@ else
 fi
 
 if test "x$found_closefrom" = xyes; then
-	$as_echo "#define HAVE_CLOSEFROM 1
-" >>confdefs.h
+	$as_echo "#define HAVE_CLOSEFROM 1" >>confdefs.h
 
 fi
  if test "x$found_closefrom" = xno; then
@@ -5170,8 +5108,7 @@ else
 fi
 
 if test "x$found_daemon" = xyes; then
-	$as_echo "#define HAVE_DAEMON 1
-" >>confdefs.h
+	$as_echo "#define HAVE_DAEMON 1" >>confdefs.h
 
 fi
  if test "x$found_daemon" = xno; then
@@ -5192,8 +5129,7 @@ else
 fi
 
 if test "x$found_setenv" = xyes; then
-	$as_echo "#define HAVE_SETENV 1
-" >>confdefs.h
+	$as_echo "#define HAVE_SETENV 1" >>confdefs.h
 
 fi
  if test "x$found_setenv" = xno; then
@@ -5214,8 +5150,7 @@ else
 fi
 
 if test "x$found_strlcpy" = xyes; then
-	$as_echo "#define HAVE_STRLCPY 1
-" >>confdefs.h
+	$as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
 
 fi
  if test "x$found_strlcpy" = xno; then
@@ -5236,8 +5171,7 @@ else
 fi
 
 if test "x$found_strlcat" = xyes; then
-	$as_echo "#define HAVE_STRLCAT 1
-" >>confdefs.h
+	$as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
 
 fi
  if test "x$found_strlcat" = xno; then
@@ -5258,8 +5192,7 @@ else
 fi
 
 if test "x$found_asprintf" = xyes; then
-	$as_echo "#define HAVE_ASPRINTF 1
-" >>confdefs.h
+	$as_echo "#define HAVE_ASPRINTF 1" >>confdefs.h
 
 fi
  if test "x$found_asprintf" = xno; then
@@ -5280,8 +5213,7 @@ else
 fi
 
 if test "x$found_fgetln" = xyes; then
-	$as_echo "#define HAVE_FGETLN 1
-" >>confdefs.h
+	$as_echo "#define HAVE_FGETLN 1" >>confdefs.h
 
 fi
  if test "x$found_fgetln" = xno; then
@@ -5302,8 +5234,7 @@ else
 fi
 
 if test "x$found_strcasestr" = xyes; then
-	$as_echo "#define HAVE_STRCASESTR 1
-" >>confdefs.h
+	$as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h
 
 fi
  if test "x$found_strcasestr" = xno; then
@@ -5324,8 +5255,7 @@ else
 fi
 
 if test "x$found_strsep" = xyes; then
-	$as_echo "#define HAVE_STRSEP 1
-" >>confdefs.h
+	$as_echo "#define HAVE_STRSEP 1" >>confdefs.h
 
 fi
  if test "x$found_strsep" = xno; then
@@ -5346,8 +5276,7 @@ else
 fi
 
 if test "x$found_strtonum" = xyes; then
-	$as_echo "#define HAVE_STRTONUM 1
-" >>confdefs.h
+	$as_echo "#define HAVE_STRTONUM 1" >>confdefs.h
 
 fi
  if test "x$found_strtonum" = xno; then
@@ -5368,8 +5297,7 @@ else
 fi
 
 if test "x$found_strnvis" = xyes; then
-	$as_echo "#define HAVE_VIS 1
-" >>confdefs.h
+	$as_echo "#define HAVE_VIS 1" >>confdefs.h
 
 fi
  if test "x$found_strnvis" = xno; then
@@ -5404,7 +5332,6 @@ fi
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_OPTARG $ac_have_decl
-
 _ACEOF
 if test $ac_have_decl = 1; then :
 
@@ -5424,7 +5351,6 @@ fi
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_OPTIND $ac_have_decl
-
 _ACEOF
 if test $ac_have_decl = 1; then :
 
@@ -5444,7 +5370,6 @@ fi
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_OPTRESET $ac_have_decl
-
 _ACEOF
 if test $ac_have_decl = 1; then :
 
@@ -5462,8 +5387,7 @@ $as_echo "yes" >&6; }
 		else
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-			$as_echo "#define HAVE_GETOPT 1
-" >>confdefs.h
+			$as_echo "#define HAVE_GETOPT 1" >>confdefs.h
 
 		fi
 	fi
@@ -5485,14 +5409,12 @@ for ac_func in  \
 
 
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func
-" | $as_tr_sh`
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 eval as_val=\$$as_ac_var
    if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-
 _ACEOF
 
 fi
@@ -5516,8 +5438,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define HAVE_BSD_TYPES 1
-" >>confdefs.h
+  $as_echo "#define HAVE_BSD_TYPES 1" >>confdefs.h
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
@@ -5547,8 +5468,7 @@ else
 fi
 
 if test "x$found_queue_h" = xyes; then
-	$as_echo "#define HAVE_QUEUE_H 1
-" >>confdefs.h
+	$as_echo "#define HAVE_QUEUE_H 1" >>confdefs.h
 
 fi
 
@@ -5569,8 +5489,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  $as_echo "#define HAVE___PROGNAME 1
-" >>confdefs.h
+  $as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
@@ -5586,8 +5505,7 @@ ac_fn_c_check_decl "$LINENO" "F_CLOSEM" 
 
 "
 if test "x$ac_cv_have_decl_F_CLOSEM" = x""yes; then :
-  $as_echo "#define HAVE_FCNTL_CLOSEM 1
-" >>confdefs.h
+  $as_echo "#define HAVE_FCNTL_CLOSEM 1" >>confdefs.h
 
 fi
 
@@ -5596,8 +5514,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/\$\$" >&5
 $as_echo_n "checking for /proc/\$\$... " >&6; }
 if test -d /proc/$$; then
-	$as_echo "#define HAVE_PROC_PID 1
-" >>confdefs.h
+	$as_echo "#define HAVE_PROC_PID 1" >>confdefs.h
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -5610,8 +5527,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/\$\$/fd" >&5
 $as_echo_n "checking for /proc/\$\$/fd... " >&6; }
 if test -d /proc/$$/fd; then
-	$as_echo "#define HAVE_DIRFD 1
-" >>confdefs.h
+	$as_echo "#define HAVE_DIRFD 1" >>confdefs.h
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -5632,17 +5548,21 @@ $as_echo "aix" >&6; }
 	*darwin*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: darwin" >&5
 $as_echo "darwin" >&6; }
-		$as_echo "#define BROKEN_CMSG_FIRSTHDR 1
-" >>confdefs.h
+		$as_echo "#define BROKEN_CMSG_FIRSTHDR 1" >>confdefs.h
 
 		PLATFORM=darwin
 		;;
+	*dragonfly*)
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: dragonfly" >&5
+$as_echo "dragonfly" >&6; }
+		PLATFORM=dragonfly
+		;;
 	*linux*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: linux" >&5
 $as_echo "linux" >&6; }
 		PLATFORM=linux
 		;;
-	*freebsd*|*dragonfly*)
+	*freebsd*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: freebsd" >&5
 $as_echo "freebsd" >&6; }
 		PLATFORM=freebsd
@@ -5695,6 +5615,14 @@ else
   IS_DARWIN_FALSE=
 fi
 
+ if test "x$PLATFORM" = xdragonfly; then
+  IS_DRAGONFLY_TRUE=
+  IS_DRAGONFLY_FALSE='#'
+else
+  IS_DRAGONFLY_TRUE='#'
+  IS_DRAGONFLY_FALSE=
+fi
+
  if test "x$PLATFORM" = xlinux; then
   IS_LINUX_TRUE=
   IS_LINUX_FALSE='#'
@@ -5920,6 +5848,10 @@ if test -z "${IS_GLIBC_TRUE}" && test -z
   as_fn_error "conditional \"IS_GLIBC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${NO_B64_NTOP_TRUE}" && test -z "${NO_B64_NTOP_FALSE}"; then
+  as_fn_error "conditional \"NO_B64_NTOP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${NO_IMSG_TRUE}" && test -z "${NO_IMSG_FALSE}"; then
   as_fn_error "conditional \"NO_IMSG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -5984,6 +5916,10 @@ if test -z "${IS_DARWIN_TRUE}" && test -
   as_fn_error "conditional \"IS_DARWIN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${IS_DRAGONFLY_TRUE}" && test -z "${IS_DRAGONFLY_FALSE}"; then
+  as_fn_error "conditional \"IS_DRAGONFLY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${IS_LINUX_TRUE}" && test -z "${IS_LINUX_FALSE}"; then
   as_fn_error "conditional \"IS_LINUX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6462,7 +6398,6 @@ Usage: $0 [OPTION]... [TAG]...
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
       --file=FILE[:TEMPLATE]
-
                    instantiate the configuration file FILE
 
 Configuration files: