| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | $NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $ | | 1 | $NetBSD: patch-ac,v 1.12 2017/07/12 10:53:23 wiz Exp $ |
2 | | | 2 | |
3 | --- configure.orig 2006-08-16 18:02:25.000000000 +0000 | | 3 | --- configure.orig 2006-08-16 18:02:25.000000000 +0000 |
4 | +++ configure | | 4 | +++ configure |
5 | @@ -1,25 +1,82 @@ | | 5 | @@ -1,25 +1,82 @@ |
6 | #! /bin/sh | | 6 | #! /bin/sh |
7 | # Guess values for system-dependent variables and create Makefiles. | | 7 | # Guess values for system-dependent variables and create Makefiles. |
8 | -# Generated by GNU Autoconf 2.59. | | 8 | -# Generated by GNU Autoconf 2.59. |
9 | +# Generated by GNU Autoconf 2.63. | | 9 | +# Generated by GNU Autoconf 2.63. |
10 | # | | 10 | # |
11 | -# Copyright (C) 2003 Free Software Foundation, Inc. | | 11 | -# Copyright (C) 2003 Free Software Foundation, Inc. |
12 | +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | | 12 | +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
13 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | | 13 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
14 | # This configure script is free software; the Free Software Foundation | | 14 | # This configure script is free software; the Free Software Foundation |
| @@ -1117,27 +1117,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 | | | @@ -1117,27 +1117,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 |
1117 | + eval with_$ac_useropt=no ;; | | 1117 | + eval with_$ac_useropt=no ;; |
1118 | | | 1118 | |
1119 | --x) | | 1119 | --x) |
1120 | # Obsolete; use --with-x. | | 1120 | # Obsolete; use --with-x. |
1121 | @@ -623,7 +1107,7 @@ do | | 1121 | @@ -623,7 +1107,7 @@ do |
1122 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | | 1122 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
1123 | x_libraries=$ac_optarg ;; | | 1123 | x_libraries=$ac_optarg ;; |
1124 | | | 1124 | |
1125 | - -*) { echo "$as_me: error: unrecognized option: $ac_option | | 1125 | - -*) { echo "$as_me: error: unrecognized option: $ac_option |
1126 | + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option | | 1126 | + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option |
1127 | Try \`$0 --help' for more information." >&2 | | 1127 | Try \`$0 --help' for more information." >&2 |
1128 | { (exit 1); exit 1; }; } | | 1128 | { (exit 1); exit 1; }; } |
1129 | ;; | | 1129 | ;; |
1130 | @@ -632,17 +1116,16 @@ Try \`$0 --help' for more information." | | 1130 | @@ -632,17 +1116,16 @@ Try \`$0 --help' for more information." |
1131 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` | | 1131 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` |
1132 | # Reject names that are not valid shell variable names. | | 1132 | # Reject names that are not valid shell variable names. |
1133 | expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | | 1133 | expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && |
1134 | - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | | 1134 | - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 |
1135 | + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | | 1135 | + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 |
1136 | { (exit 1); exit 1; }; } | | 1136 | { (exit 1); exit 1; }; } |
1137 | - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` | | 1137 | - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` |
1138 | - eval "$ac_envvar='$ac_optarg'" | | 1138 | - eval "$ac_envvar='$ac_optarg'" |
1139 | + eval $ac_envvar=\$ac_optarg | | 1139 | + eval $ac_envvar=\$ac_optarg |
1140 | export $ac_envvar ;; | | 1140 | export $ac_envvar ;; |
1141 | | | 1141 | |
1142 | *) | | 1142 | *) |
1143 | # FIXME: should be removed in autoconf 3.0. | | 1143 | # FIXME: should be removed in autoconf 3.0. |
| @@ -3073,27 +3073,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 | | | @@ -3073,27 +3073,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 |
3073 | array size at least. It's necessary to write '\x00'==0 to get something | | 3073 | array size at least. It's necessary to write '\x00'==0 to get something |
3074 | - that's true only with -std1. */ | | 3074 | - that's true only with -std1. */ |
3075 | + that's true only with -std. */ | | 3075 | + that's true only with -std. */ |
3076 | int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | | 3076 | int osf4_cc_array ['\x00' == 0 ? 1 : -1]; |
3077 | | | 3077 | |
3078 | +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters | | 3078 | +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters |
3079 | + inside strings and character constants. */ | | 3079 | + inside strings and character constants. */ |
3080 | +#define FOO(x) 'x' | | 3080 | +#define FOO(x) 'x' |
3081 | +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; | | 3081 | +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; |
3082 | + | | 3082 | + |
3083 | int test (int i, double x); | | 3083 | int test (int i, double x); |
3084 | struct s1 {int (*f) (int a);}; | | 3084 | struct s1 {int (*f) (int a);}; |
3085 | struct s2 {int (*f) (double a);}; | | 3085 | struct s2 {int (*f) (double a);}; |
3086 | @@ -2098,219 +2782,72 @@ return f (e, argv, 0) != argv[0] || f | | 3086 | @@ -2098,219 +2782,72 @@ return f (e, argv, 0) != argv[0] || f |
3087 | return 0; | | 3087 | return 0; |
3088 | } | | 3088 | } |
3089 | _ACEOF | | 3089 | _ACEOF |
3090 | -# Don't try gcc -ansi; that turns off useful extensions and | | 3090 | -# Don't try gcc -ansi; that turns off useful extensions and |
3091 | -# breaks some systems' header files. | | 3091 | -# breaks some systems' header files. |
3092 | -# AIX -qlanglvl=ansi | | 3092 | -# AIX -qlanglvl=ansi |
3093 | -# Ultrix and OSF/1 -std1 | | 3093 | -# Ultrix and OSF/1 -std1 |
3094 | -# HP-UX 10.20 and later -Ae | | 3094 | -# HP-UX 10.20 and later -Ae |
3095 | -# HP-UX older versions -Aa -D_HPUX_SOURCE | | 3095 | -# HP-UX older versions -Aa -D_HPUX_SOURCE |
3096 | -# SVR4 -Xc -D__EXTENSIONS__ | | 3096 | -# SVR4 -Xc -D__EXTENSIONS__ |
3097 | -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | | 3097 | -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
3098 | +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ | | 3098 | +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ |
3099 | + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | | 3099 | + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
| @@ -8276,27 +8276,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 | | | @@ -8276,27 +8276,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 |
8276 | -## Running $as_me. ## | | 8276 | -## Running $as_me. ## |
8277 | -_ASBOX | | 8277 | -_ASBOX |
8278 | -} >&5 | | 8278 | -} >&5 |
8279 | -cat >&5 <<_CSEOF | | 8279 | -cat >&5 <<_CSEOF |
8280 | - | | 8280 | - |
8281 | +# values after options handling. | | 8281 | +# values after options handling. |
8282 | +ac_log=" | | 8282 | +ac_log=" |
8283 | This file was extended by $as_me, which was | | 8283 | This file was extended by $as_me, which was |
8284 | -generated by GNU Autoconf 2.59. Invocation command line was | | 8284 | -generated by GNU Autoconf 2.59. Invocation command line was |
8285 | +generated by GNU Autoconf 2.63. Invocation command line was | | 8285 | +generated by GNU Autoconf 2.63. Invocation command line was |
8286 | | | 8286 | |
8287 | CONFIG_FILES = $CONFIG_FILES | | 8287 | CONFIG_FILES = $CONFIG_FILES |
8288 | CONFIG_HEADERS = $CONFIG_HEADERS | | 8288 | CONFIG_HEADERS = $CONFIG_HEADERS |
8289 | @@ -5607,124 +6559,108 @@ generated by GNU Autoconf 2.59. Invocat | | 8289 | @@ -5607,124 +6559,106 @@ generated by GNU Autoconf 2.59. Invocat |
8290 | CONFIG_COMMANDS = $CONFIG_COMMANDS | | 8290 | CONFIG_COMMANDS = $CONFIG_COMMANDS |
8291 | $ $0 $@ | | 8291 | $ $0 $@ |
8292 | | | 8292 | |
8293 | -_CSEOF | | 8293 | -_CSEOF |
8294 | -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 | | 8294 | -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 |
8295 | -echo >&5 | | 8295 | -echo >&5 |
8296 | +on `(hostname || uname -n) 2>/dev/null | sed 1q` | | 8296 | +on `(hostname || uname -n) 2>/dev/null | sed 1q` |
8297 | +" | | 8297 | +" |
8298 | + | | 8298 | + |
8299 | _ACEOF | | 8299 | _ACEOF |
8300 | | | 8300 | |
8301 | -# Files that config.status was made for. | | 8301 | -# Files that config.status was made for. |
8302 | -if test -n "$ac_config_files"; then | | 8302 | -if test -n "$ac_config_files"; then |
| @@ -8395,28 +8395,26 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 | | | @@ -8395,28 +8395,26 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 |
8395 | ac_shift=shift | | 8395 | ac_shift=shift |
8396 | ;; | | 8396 | ;; |
8397 | - *) # This is not an option, so the user has probably given explicit | | 8397 | - *) # This is not an option, so the user has probably given explicit |
8398 | - # arguments. | | 8398 | - # arguments. |
8399 | - ac_option=$1 | | 8399 | - ac_option=$1 |
8400 | - ac_need_defaults=false;; | | 8400 | - ac_need_defaults=false;; |
8401 | esac | | 8401 | esac |
8402 | | | 8402 | |
8403 | case $ac_option in | | 8403 | case $ac_option in |
8404 | # Handling of the options. | | 8404 | # Handling of the options. |
8405 | -_ACEOF | | 8405 | -_ACEOF |
8406 | -cat >>$CONFIG_STATUS <<\_ACEOF | | 8406 | -cat >>$CONFIG_STATUS <<\_ACEOF |
8407 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | | 8407 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) |
8408 | + : Avoid regenerating within pkgsrc | | | |
8409 | + exit 0 | | | |
8410 | ac_cs_recheck=: ;; | | 8408 | ac_cs_recheck=: ;; |
8411 | - --version | --vers* | -V ) | | 8409 | - --version | --vers* | -V ) |
8412 | - echo "$ac_cs_version"; exit 0 ;; | | 8410 | - echo "$ac_cs_version"; exit 0 ;; |
8413 | - --he | --h) | | 8411 | - --he | --h) |
8414 | - # Conflict between --help and --header | | 8412 | - # Conflict between --help and --header |
8415 | - { { echo "$as_me:$LINENO: error: ambiguous option: $1 | | 8413 | - { { echo "$as_me:$LINENO: error: ambiguous option: $1 |
8416 | -Try \`$0 --help' for more information." >&5 | | 8414 | -Try \`$0 --help' for more information." >&5 |
8417 | -echo "$as_me: error: ambiguous option: $1 | | 8415 | -echo "$as_me: error: ambiguous option: $1 |
8418 | -Try \`$0 --help' for more information." >&2;} | | 8416 | -Try \`$0 --help' for more information." >&2;} |
8419 | - { (exit 1); exit 1; }; };; | | 8417 | - { (exit 1); exit 1; }; };; |
8420 | - --help | --hel | -h ) | | 8418 | - --help | --hel | -h ) |
8421 | - echo "$ac_cs_usage"; exit 0 ;; | | 8419 | - echo "$ac_cs_usage"; exit 0 ;; |
8422 | - --debug | --d* | -d ) | | 8420 | - --debug | --d* | -d ) |
| @@ -8447,27 +8445,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 | | | @@ -8447,27 +8445,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 |
8447 | -Try \`$0 --help' for more information." >&5 | | 8445 | -Try \`$0 --help' for more information." >&5 |
8448 | -echo "$as_me: error: unrecognized option: $1 | | 8446 | -echo "$as_me: error: unrecognized option: $1 |
8449 | -Try \`$0 --help' for more information." >&2;} | | 8447 | -Try \`$0 --help' for more information." >&2;} |
8450 | + -*) { $as_echo "$as_me: error: unrecognized option: $1 | | 8448 | + -*) { $as_echo "$as_me: error: unrecognized option: $1 |
8451 | +Try \`$0 --help' for more information." >&2 | | 8449 | +Try \`$0 --help' for more information." >&2 |
8452 | { (exit 1); exit 1; }; } ;; | | 8450 | { (exit 1); exit 1; }; } ;; |
8453 | | | 8451 | |
8454 | - *) ac_config_targets="$ac_config_targets $1" ;; | | 8452 | - *) ac_config_targets="$ac_config_targets $1" ;; |
8455 | + *) ac_config_targets="$ac_config_targets $1" | | 8453 | + *) ac_config_targets="$ac_config_targets $1" |
8456 | + ac_need_defaults=false ;; | | 8454 | + ac_need_defaults=false ;; |
8457 | | | 8455 | |
8458 | esac | | 8456 | esac |
8459 | shift | | 8457 | shift |
8460 | @@ -5738,32 +6674,48 @@ if $ac_cs_silent; then | | 8458 | @@ -5738,32 +6676,48 @@ if $ac_cs_silent; then |
8461 | fi | | 8459 | fi |
8462 | | | 8460 | |
8463 | _ACEOF | | 8461 | _ACEOF |
8464 | -cat >>$CONFIG_STATUS <<_ACEOF | | 8462 | -cat >>$CONFIG_STATUS <<_ACEOF |
8465 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | | 8463 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
8466 | if \$ac_cs_recheck; then | | 8464 | if \$ac_cs_recheck; then |
8467 | - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | | 8465 | - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 |
8468 | - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | | 8466 | - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
8469 | + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | | 8467 | + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
8470 | + shift | | 8468 | + shift |
8471 | + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 | | 8469 | + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
8472 | + CONFIG_SHELL='$SHELL' | | 8470 | + CONFIG_SHELL='$SHELL' |
8473 | + export CONFIG_SHELL | | 8471 | + export CONFIG_SHELL |
| @@ -8509,27 +8507,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 | | | @@ -8509,27 +8507,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 |
8509 | + "interface/Makefile") CONFIG_FILES="$CONFIG_FILES interface/Makefile" ;; | | 8507 | + "interface/Makefile") CONFIG_FILES="$CONFIG_FILES interface/Makefile" ;; |
8510 | + "paranoia/Makefile") CONFIG_FILES="$CONFIG_FILES paranoia/Makefile" ;; | | 8508 | + "paranoia/Makefile") CONFIG_FILES="$CONFIG_FILES paranoia/Makefile" ;; |
8511 | + | | 8509 | + |
8512 | + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | | 8510 | + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |
8513 | +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | | 8511 | +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |
8514 | { (exit 1); exit 1; }; };; | | 8512 | { (exit 1); exit 1; }; };; |
8515 | esac | | 8513 | esac |
8516 | done | | 8514 | done |
8517 | | | 8515 | |
8518 | + | | 8516 | + |
8519 | # If the user did not use the arguments to specify the items to instantiate, | | 8517 | # If the user did not use the arguments to specify the items to instantiate, |
8520 | # then the envvar interface is used. Set only those that are not. | | 8518 | # then the envvar interface is used. Set only those that are not. |
8521 | # We use the long form for the default assignment because of an extremely | | 8519 | # We use the long form for the default assignment because of an extremely |
8522 | @@ -5773,344 +6725,464 @@ if $ac_need_defaults; then | | 8520 | @@ -5773,344 +6727,464 @@ if $ac_need_defaults; then |
8523 | fi | | 8521 | fi |
8524 | | | 8522 | |
8525 | # Have a temporary directory for convenience. Make it in the build tree | | 8523 | # Have a temporary directory for convenience. Make it in the build tree |
8526 | -# simply because there is no reason to put it here, and in addition, | | 8524 | -# simply because there is no reason to put it here, and in addition, |
8527 | +# simply because there is no reason against having it here, and in addition, | | 8525 | +# simply because there is no reason against having it here, and in addition, |
8528 | # creating and moving files from /tmp can sometimes cause problems. | | 8526 | # creating and moving files from /tmp can sometimes cause problems. |
8529 | -# Create a temporary directory, and hook for its removal unless debugging. | | 8527 | -# Create a temporary directory, and hook for its removal unless debugging. |
8530 | +# Hook for its removal unless debugging. | | 8528 | +# Hook for its removal unless debugging. |
8531 | +# Note that there is a small window in which the directory will not be cleaned: | | 8529 | +# Note that there is a small window in which the directory will not be cleaned: |
8532 | +# after its creation but before its name has been assigned to `$tmp'. | | 8530 | +# after its creation but before its name has been assigned to `$tmp'. |
8533 | $debug || | | 8531 | $debug || |
8534 | { | | 8532 | { |
8535 | - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 | | 8533 | - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 |
| @@ -9253,22 +9251,22 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 | | | @@ -9253,22 +9251,22 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 |
9253 | { (exit 0); exit 0; } | | 9251 | { (exit 0); exit 0; } |
9254 | _ACEOF | | 9252 | _ACEOF |
9255 | chmod +x $CONFIG_STATUS | | 9253 | chmod +x $CONFIG_STATUS |
9256 | ac_clean_files=$ac_clean_files_save | | 9254 | ac_clean_files=$ac_clean_files_save |
9257 | | | 9255 | |
9258 | +test $ac_write_fail = 0 || | | 9256 | +test $ac_write_fail = 0 || |
9259 | + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 | | 9257 | + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 |
9260 | +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} | | 9258 | +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} |
9261 | + { (exit 1); exit 1; }; } | | 9259 | + { (exit 1); exit 1; }; } |
9262 | + | | 9260 | + |
9263 | | | 9261 | |
9264 | # configure is writing to config.log, and then calls config.status. | | 9262 | # configure is writing to config.log, and then calls config.status. |
9265 | # config.status does its own redirection, appending to config.log. | | 9263 | # config.status does its own redirection, appending to config.log. |
9266 | @@ -6132,4 +7204,8 @@ if test "$no_create" != yes; then | | 9264 | @@ -6132,4 +7206,8 @@ if test "$no_create" != yes; then |
9267 | # would make configure fail if this is the last instruction. | | 9265 | # would make configure fail if this is the last instruction. |
9268 | $ac_cs_success || { (exit 1); exit 1; } | | 9266 | $ac_cs_success || { (exit 1); exit 1; } |
9269 | fi | | 9267 | fi |
9270 | +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then | | 9268 | +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
9271 | + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 | | 9269 | + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |
9272 | +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} | | 9270 | +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} |
9273 | +fi | | 9271 | +fi |
9274 | | | 9272 | |