Skip to content
This repository
Browse code

Regenerate configure with newer autoconf

The small change to configure.in seems to be necessary to still get the output
we want. No idea what happened so that this changed.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1674 726aef4b-f618-498e-8847-2d620e286838
  • Loading branch information...
commit 65394f611f3bdc3d63ad6e3083d953d476dfae63 1 parent 3fd82a6
psychon authored

Showing 2 changed files with 103 additions and 72 deletions. Show diff stats Hide diff stats

  1. +101 70 configure
  2. +2 2 configure.in
171 configure
... ... @@ -1,10 +1,12 @@
1 1 #! /bin/sh
2 2 # Guess values for system-dependent variables and create Makefiles.
3   -# Generated by GNU Autoconf 2.64 for znc 0.077.
  3 +# Generated by GNU Autoconf 2.65 for znc 0.077.
  4 +#
4 5 #
5 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
6   -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
7   -# Foundation, Inc.
  7 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
  8 +# Inc.
  9 +#
8 10 #
9 11 # This configure script is free software; the Free Software Foundation
10 12 # gives unlimited permission to copy, distribute and modify it.
@@ -523,7 +525,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
523 525 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
524 526
525 527
526   -exec 7<&0 </dev/null 6>&1
  528 +test -n "$DJDIR" || exec 7<&0 </dev/null
  529 +exec 6>&1
527 530
528 531 # Name of the host.
529 532 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -1296,7 +1299,7 @@ Some influential environment variables:
1296 1299 LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
1297 1300 nonstandard directory <lib dir>
1298 1301 LIBS libraries to pass to the linker, e.g. -l<library>
1299   - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
  1302 + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
1300 1303 you have headers in a nonstandard directory <include dir>
1301 1304 PKG_CONFIG path to pkg-config utility
1302 1305 c_ares_CFLAGS
@@ -1370,7 +1373,7 @@ test -n "$ac_init_help" && exit $ac_status
1370 1373 if $ac_init_version; then
1371 1374 cat <<\_ACEOF
1372 1375 znc configure 0.077
1373   -generated by GNU Autoconf 2.64
  1376 +generated by GNU Autoconf 2.65
1374 1377
1375 1378 Copyright (C) 2009 Free Software Foundation, Inc.
1376 1379 This configure script is free software; the Free Software Foundation
@@ -1417,7 +1420,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
1417 1420 ac_retval=1
1418 1421 fi
1419 1422 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1420   - return $ac_retval
  1423 + as_fn_set_status $ac_retval
1421 1424
1422 1425 } # ac_fn_cxx_try_compile
1423 1426
@@ -1463,7 +1466,7 @@ fi
1463 1466 # left behind by Apple's compiler. We do this before executing the actions.
1464 1467 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1465 1468 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1466   - return $ac_retval
  1469 + as_fn_set_status $ac_retval
1467 1470
1468 1471 } # ac_fn_cxx_try_link
1469 1472
@@ -1538,7 +1541,7 @@ This file contains any messages produced by compilers while
1538 1541 running configure, to aid debugging if configure makes a mistake.
1539 1542
1540 1543 It was created by znc $as_me 0.077, which was
1541   -generated by GNU Autoconf 2.64. Invocation command line was
  1544 +generated by GNU Autoconf 2.65. Invocation command line was
1542 1545
1543 1546 $ $0 $@
1544 1547
@@ -1791,7 +1794,7 @@ fi
1791 1794 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
1792 1795 do
1793 1796 test "x$ac_site_file" = xNONE && continue
1794   - if test -r "$ac_site_file"; then
  1797 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
1795 1798 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
1796 1799 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
1797 1800 sed 's/^/| /' "$ac_site_file" >&5
@@ -1800,9 +1803,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
1800 1803 done
1801 1804
1802 1805 if test -r "$cache_file"; then
1803   - # Some versions of bash will fail to source /dev/null (special
1804   - # files actually), so we avoid doing that.
1805   - if test -f "$cache_file"; then
  1806 + # Some versions of bash will fail to source /dev/null (special files
  1807 + # actually), so we avoid doing that. DJGPP emulates it as a regular file.
  1808 + if test /dev/null != "$cache_file" && test -f "$cache_file"; then
1806 1809 { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
1807 1810 $as_echo "$as_me: loading cache $cache_file" >&6;}
1808 1811 case $cache_file in
@@ -2024,32 +2027,30 @@ $as_echo "$ac_try_echo"; } >&5
2024 2027 ... rest of stderr output deleted ...
2025 2028 10q' conftest.err >conftest.er1
2026 2029 cat conftest.er1 >&5
2027   - rm -f conftest.er1 conftest.err
2028 2030 fi
  2031 + rm -f conftest.er1 conftest.err
2029 2032 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2030 2033 test $ac_status = 0; }
2031 2034 done
2032 2035
2033 2036 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2034 2037 /* end confdefs.h. */
2035   -#include <stdio.h>
  2038 +
2036 2039 int
2037 2040 main ()
2038 2041 {
2039   -FILE *f = fopen ("conftest.out", "w");
2040   - return ferror (f) || fclose (f) != 0;
2041 2042
2042 2043 ;
2043 2044 return 0;
2044 2045 }
2045 2046 _ACEOF
2046 2047 ac_clean_files_save=$ac_clean_files
2047   -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
  2048 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
2048 2049 # Try to create an executable without -o first, disregard a.out.
2049 2050 # It will help us diagnose broken compilers, and finding out an intuition
2050 2051 # of exeext.
2051   -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
2052   -$as_echo_n "checking for C++ compiler default output file name... " >&6; }
  2052 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
  2053 +$as_echo_n "checking whether the C++ compiler works... " >&6; }
2053 2054 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2054 2055
2055 2056 # The possible output files:
@@ -2111,10 +2112,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
2111 2112 else
2112 2113 ac_file=''
2113 2114 fi
2114   -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
2115   -$as_echo "$ac_file" >&6; }
2116 2115 if test -z "$ac_file"; then :
2117   - $as_echo "$as_me: failed program was:" >&5
  2116 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2117 +$as_echo "no" >&6; }
  2118 +$as_echo "$as_me: failed program was:" >&5
2118 2119 sed 's/^/| /' conftest.$ac_ext >&5
2119 2120
2120 2121 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -2122,51 +2123,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2122 2123 { as_fn_set_status 77
2123 2124 as_fn_error "C++ compiler cannot create executables
2124 2125 See \`config.log' for more details." "$LINENO" 5; }; }
  2126 +else
  2127 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  2128 +$as_echo "yes" >&6; }
2125 2129 fi
  2130 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
  2131 +$as_echo_n "checking for C++ compiler default output file name... " >&6; }
  2132 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
  2133 +$as_echo "$ac_file" >&6; }
2126 2134 ac_exeext=$ac_cv_exeext
2127 2135
2128   -# Check that the compiler produces executables we can run. If not, either
2129   -# the compiler is broken, or we cross compile.
2130   -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
2131   -$as_echo_n "checking whether the C++ compiler works... " >&6; }
2132   -# If not cross compiling, check that we can run a simple program.
2133   -if test "$cross_compiling" != yes; then
2134   - if { ac_try='./$ac_file'
2135   - { { case "(($ac_try" in
2136   - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2137   - *) ac_try_echo=$ac_try;;
2138   -esac
2139   -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
2140   -$as_echo "$ac_try_echo"; } >&5
2141   - (eval "$ac_try") 2>&5
2142   - ac_status=$?
2143   - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2144   - test $ac_status = 0; }; }; then
2145   - cross_compiling=no
2146   - else
2147   - if test "$cross_compiling" = maybe; then
2148   - cross_compiling=yes
2149   - else
2150   - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2151   -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2152   -as_fn_error "cannot run C++ compiled programs.
2153   -If you meant to cross compile, use \`--host'.
2154   -See \`config.log' for more details." "$LINENO" 5; }
2155   - fi
2156   - fi
2157   -fi
2158   -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2159   -$as_echo "yes" >&6; }
2160   -
2161   -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
  2136 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
2162 2137 ac_clean_files=$ac_clean_files_save
2163   -# Check that the compiler produces executables we can run. If not, either
2164   -# the compiler is broken, or we cross compile.
2165   -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
2166   -$as_echo_n "checking whether we are cross compiling... " >&6; }
2167   -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
2168   -$as_echo "$cross_compiling" >&6; }
2169   -
2170 2138 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
2171 2139 $as_echo_n "checking for suffix of executables... " >&6; }
2172 2140 if { { ac_try="$ac_link"
@@ -2199,13 +2167,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2199 2167 as_fn_error "cannot compute suffix of executables: cannot compile and link
2200 2168 See \`config.log' for more details." "$LINENO" 5; }
2201 2169 fi
2202   -rm -f conftest$ac_cv_exeext
  2170 +rm -f conftest conftest$ac_cv_exeext
2203 2171 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
2204 2172 $as_echo "$ac_cv_exeext" >&6; }
2205 2173
2206 2174 rm -f conftest.$ac_ext
2207 2175 EXEEXT=$ac_cv_exeext
2208 2176 ac_exeext=$EXEEXT
  2177 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2178 +/* end confdefs.h. */
  2179 +#include <stdio.h>
  2180 +int
  2181 +main ()
  2182 +{
  2183 +FILE *f = fopen ("conftest.out", "w");
  2184 + return ferror (f) || fclose (f) != 0;
  2185 +
  2186 + ;
  2187 + return 0;
  2188 +}
  2189 +_ACEOF
  2190 +ac_clean_files="$ac_clean_files conftest.out"
  2191 +# Check that the compiler produces executables we can run. If not, either
  2192 +# the compiler is broken, or we cross compile.
  2193 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
  2194 +$as_echo_n "checking whether we are cross compiling... " >&6; }
  2195 +if test "$cross_compiling" != yes; then
  2196 + { { ac_try="$ac_link"
  2197 +case "(($ac_try" in
  2198 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  2199 + *) ac_try_echo=$ac_try;;
  2200 +esac
  2201 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  2202 +$as_echo "$ac_try_echo"; } >&5
  2203 + (eval "$ac_link") 2>&5
  2204 + ac_status=$?
  2205 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  2206 + test $ac_status = 0; }
  2207 + if { ac_try='./conftest$ac_cv_exeext'
  2208 + { { case "(($ac_try" in
  2209 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  2210 + *) ac_try_echo=$ac_try;;
  2211 +esac
  2212 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  2213 +$as_echo "$ac_try_echo"; } >&5
  2214 + (eval "$ac_try") 2>&5
  2215 + ac_status=$?
  2216 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  2217 + test $ac_status = 0; }; }; then
  2218 + cross_compiling=no
  2219 + else
  2220 + if test "$cross_compiling" = maybe; then
  2221 + cross_compiling=yes
  2222 + else
  2223 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  2224 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  2225 +as_fn_error "cannot run C++ compiled programs.
  2226 +If you meant to cross compile, use \`--host'.
  2227 +See \`config.log' for more details." "$LINENO" 5; }
  2228 + fi
  2229 + fi
  2230 +fi
  2231 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
  2232 +$as_echo "$cross_compiling" >&6; }
  2233 +
  2234 +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
  2235 +ac_clean_files=$ac_clean_files_save
2209 2236 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
2210 2237 $as_echo_n "checking for suffix of object files... " >&6; }
2211 2238 if test "${ac_cv_objext+set}" = set; then :
@@ -4075,7 +4102,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4075 4102 # values after options handling.
4076 4103 ac_log="
4077 4104 This file was extended by znc $as_me 0.077, which was
4078   -generated by GNU Autoconf 2.64. Invocation command line was
  4105 +generated by GNU Autoconf 2.65. Invocation command line was
4079 4106
4080 4107 CONFIG_FILES = $CONFIG_FILES
4081 4108 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -4110,6 +4137,7 @@ Usage: $0 [OPTION]... [TAG]...
4110 4137
4111 4138 -h, --help print this help, then exit
4112 4139 -V, --version print version number and configuration settings, then exit
  4140 + --config print configuration, then exit
4113 4141 -q, --quiet, --silent
4114 4142 do not print progress messages
4115 4143 -d, --debug don't remove temporary files
@@ -4124,10 +4152,11 @@ Report bugs to the package provider."
4124 4152
4125 4153 _ACEOF
4126 4154 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  4155 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
4127 4156 ac_cs_version="\\
4128 4157 znc config.status 0.077
4129   -configured by $0, generated by GNU Autoconf 2.64,
4130   - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  4158 +configured by $0, generated by GNU Autoconf 2.65,
  4159 + with options \\"\$ac_cs_config\\"
4131 4160
4132 4161 Copyright (C) 2009 Free Software Foundation, Inc.
4133 4162 This config.status script is free software; the Free Software Foundation
@@ -4162,6 +4191,8 @@ do
4162 4191 ac_cs_recheck=: ;;
4163 4192 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
4164 4193 $as_echo "$ac_cs_version"; exit ;;
  4194 + --config | --confi | --conf | --con | --co | --c )
  4195 + $as_echo "$ac_cs_config"; exit ;;
4165 4196 --debug | --debu | --deb | --de | --d | -d )
4166 4197 debug=: ;;
4167 4198 --file | --fil | --fi | --f )
@@ -4335,7 +4366,7 @@ s/'"$ac_delim"'$//
4335 4366 t delim
4336 4367 :nl
4337 4368 h
4338   -s/\(.\{148\}\).*/\1/
  4369 +s/\(.\{148\}\)..*/\1/
4339 4370 t more1
4340 4371 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
4341 4372 p
@@ -4349,7 +4380,7 @@ s/.\{148\}//
4349 4380 t nl
4350 4381 :delim
4351 4382 h
4352   -s/\(.\{148\}\).*/\1/
  4383 +s/\(.\{148\}\)..*/\1/
4353 4384 t more2
4354 4385 s/["\\]/\\&/g; s/^/"/; s/$/"/
4355 4386 p
4 configure.in
@@ -166,13 +166,13 @@ if test -z "$NOSSL"; then
166 166 fi
167 167
168 168 AC_ARG_WITH( [module-prefix],
169   - AS_HELP_STRING([--with-module-prefix], [module object code [[LIBDIR/znc]]]),
  169 + AS_HELP_STRING([--with-module-prefix], [module object code [LIBDIR/znc]]),
170 170 [MODDIR=$withval],
171 171 [MODDIR="${libdir}/znc"] )
172 172
173 173 AC_ARG_WITH( [module-data-prefix],
174 174 AS_HELP_STRING([--with-module-data-prefix=DIR],
175   - [static module data (webadmin skins) [[DATADIR/znc]]]),
  175 + [static module data (webadmin skins) [DATADIR/znc]]),
176 176 [DATADIR=$withval],
177 177 [DATADIR="${datadir}/znc"] )
178 178

0 comments on commit 65394f6

Please sign in to comment.
Something went wrong with that request. Please try again.