added --enable-all-static and --with-all-static-libs to ease full static binary builds for selected commands
fixed a bug where the client socket is kept when keep-alive is set. it should have been closed if client EOF is detected regardless of keep-alive touched up debug messages in http-file.c
This commit is contained in:
		
							
								
								
									
										94
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										94
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@ -657,6 +657,7 @@ ENABLE_MARIADB_TRUE
 | 
			
		||||
ENABLE_SSL_FALSE
 | 
			
		||||
ENABLE_SSL_TRUE
 | 
			
		||||
SSL_LIBS
 | 
			
		||||
ALL_STATIC_LIBS
 | 
			
		||||
ENABLE_ALL_STATIC_FALSE
 | 
			
		||||
ENABLE_ALL_STATIC_TRUE
 | 
			
		||||
PTHREAD_CFLAGS
 | 
			
		||||
@ -800,6 +801,7 @@ with_sysroot
 | 
			
		||||
enable_libtool_lock
 | 
			
		||||
enable_largefile
 | 
			
		||||
enable_all_static
 | 
			
		||||
with_all_static_libs
 | 
			
		||||
enable_ssl
 | 
			
		||||
enable_mariadb
 | 
			
		||||
with_mariadb
 | 
			
		||||
@ -1480,6 +1482,9 @@ Optional Packages:
 | 
			
		||||
  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
 | 
			
		||||
  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
 | 
			
		||||
                          compiler's sysroot if not specified).
 | 
			
		||||
  --with-all-static-libs[=lib-list]
 | 
			
		||||
                          specify extra libraries to add for building the full
 | 
			
		||||
                          static binaries
 | 
			
		||||
  --with-mariadb-config[=PATH]
 | 
			
		||||
                          specify path to the mariadb_config utility
 | 
			
		||||
 | 
			
		||||
@ -6552,7 +6557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 | 
			
		||||
  lt_cv_deplibs_check_method=pass_all
 | 
			
		||||
  ;;
 | 
			
		||||
 | 
			
		||||
netbsd* | netbsdelf*-gnu)
 | 
			
		||||
netbsd*)
 | 
			
		||||
  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 | 
			
		||||
    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
 | 
			
		||||
  else
 | 
			
		||||
@ -6914,7 +6919,7 @@ esac
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
: ${AR=ar}
 | 
			
		||||
: ${AR_FLAGS=cr}
 | 
			
		||||
: ${AR_FLAGS=cru}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -7415,8 +7420,11 @@ _LT_EOF
 | 
			
		||||
  test $ac_status = 0; }; then
 | 
			
		||||
    # Now try to grab the symbols.
 | 
			
		||||
    nlist=conftest.nm
 | 
			
		||||
    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
 | 
			
		||||
    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
 | 
			
		||||
    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
 | 
			
		||||
  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
 | 
			
		||||
  ac_status=$?
 | 
			
		||||
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 | 
			
		||||
  test $ac_status = 0; } && test -s "$nlist"; then
 | 
			
		||||
      # Try sorting and uniquifying the output.
 | 
			
		||||
      if sort "$nlist" | uniq > "$nlist"T; then
 | 
			
		||||
	mv -f "$nlist"T "$nlist"
 | 
			
		||||
@ -8635,8 +8643,8 @@ int forced_loaded() { return 2;}
 | 
			
		||||
_LT_EOF
 | 
			
		||||
      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
 | 
			
		||||
      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
 | 
			
		||||
      echo "$AR cr libconftest.a conftest.o" >&5
 | 
			
		||||
      $AR cr libconftest.a conftest.o 2>&5
 | 
			
		||||
      echo "$AR cru libconftest.a conftest.o" >&5
 | 
			
		||||
      $AR cru libconftest.a conftest.o 2>&5
 | 
			
		||||
      echo "$RANLIB libconftest.a" >&5
 | 
			
		||||
      $RANLIB libconftest.a 2>&5
 | 
			
		||||
      cat > conftest.c << _LT_EOF
 | 
			
		||||
@ -9765,12 +9773,6 @@ lt_prog_compiler_static=
 | 
			
		||||
	lt_prog_compiler_pic='-KPIC'
 | 
			
		||||
	lt_prog_compiler_static='-static'
 | 
			
		||||
        ;;
 | 
			
		||||
      # flang / f18. f95 an alias for gfortran or flang on Debian
 | 
			
		||||
      flang* | f18* | f95*)
 | 
			
		||||
	lt_prog_compiler_wl='-Wl,'
 | 
			
		||||
	lt_prog_compiler_pic='-fPIC'
 | 
			
		||||
	lt_prog_compiler_static='-static'
 | 
			
		||||
        ;;
 | 
			
		||||
      # icc used to be incompatible with GCC.
 | 
			
		||||
      # ICC 10 doesn't accept -KPIC any more.
 | 
			
		||||
      icc* | ifort*)
 | 
			
		||||
@ -10247,9 +10249,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
 | 
			
		||||
  openbsd* | bitrig*)
 | 
			
		||||
    with_gnu_ld=no
 | 
			
		||||
    ;;
 | 
			
		||||
  linux* | k*bsd*-gnu | gnu*)
 | 
			
		||||
    link_all_deplibs=no
 | 
			
		||||
    ;;
 | 
			
		||||
  esac
 | 
			
		||||
 | 
			
		||||
  ld_shlibs=yes
 | 
			
		||||
@ -10504,7 +10503,7 @@ _LT_EOF
 | 
			
		||||
      fi
 | 
			
		||||
      ;;
 | 
			
		||||
 | 
			
		||||
    netbsd* | netbsdelf*-gnu)
 | 
			
		||||
    netbsd*)
 | 
			
		||||
      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 | 
			
		||||
	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 | 
			
		||||
	wlarc=
 | 
			
		||||
@ -11174,7 +11173,6 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 | 
			
		||||
	if test yes = "$lt_cv_irix_exported_symbol"; then
 | 
			
		||||
          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 | 
			
		||||
	fi
 | 
			
		||||
	link_all_deplibs=no
 | 
			
		||||
      else
 | 
			
		||||
	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 | 
			
		||||
	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
 | 
			
		||||
@ -11196,7 +11194,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 | 
			
		||||
      esac
 | 
			
		||||
      ;;
 | 
			
		||||
 | 
			
		||||
    netbsd* | netbsdelf*-gnu)
 | 
			
		||||
    netbsd*)
 | 
			
		||||
      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 | 
			
		||||
	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 | 
			
		||||
      else
 | 
			
		||||
@ -12291,6 +12289,9 @@ fi
 | 
			
		||||
  # before this can be enabled.
 | 
			
		||||
  hardcode_into_libs=yes
 | 
			
		||||
 | 
			
		||||
  # Add ABI-specific directories to the system library path.
 | 
			
		||||
  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 | 
			
		||||
 | 
			
		||||
  # Ideally, we could use ldconfig to report *all* directores which are
 | 
			
		||||
  # searched for libraries, however this is still not possible.  Aside from not
 | 
			
		||||
  # being certain /sbin/ldconfig is available, command
 | 
			
		||||
@ -12299,7 +12300,7 @@ fi
 | 
			
		||||
  # appending ld.so.conf contents (and includes) to the search path.
 | 
			
		||||
  if test -f /etc/ld.so.conf; then
 | 
			
		||||
    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 | 
			
		||||
    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 | 
			
		||||
    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  # We used to test for /lib/ld.so.1 and disable shared libraries on
 | 
			
		||||
@ -12311,18 +12312,6 @@ fi
 | 
			
		||||
  dynamic_linker='GNU/Linux ld.so'
 | 
			
		||||
  ;;
 | 
			
		||||
 | 
			
		||||
netbsdelf*-gnu)
 | 
			
		||||
  version_type=linux
 | 
			
		||||
  need_lib_prefix=no
 | 
			
		||||
  need_version=no
 | 
			
		||||
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 | 
			
		||||
  soname_spec='${libname}${release}${shared_ext}$major'
 | 
			
		||||
  shlibpath_var=LD_LIBRARY_PATH
 | 
			
		||||
  shlibpath_overrides_runpath=no
 | 
			
		||||
  hardcode_into_libs=yes
 | 
			
		||||
  dynamic_linker='NetBSD ld.elf_so'
 | 
			
		||||
  ;;
 | 
			
		||||
 | 
			
		||||
netbsd*)
 | 
			
		||||
  version_type=sunos
 | 
			
		||||
  need_lib_prefix=no
 | 
			
		||||
@ -13367,7 +13356,7 @@ else
 | 
			
		||||
    We can't simply define LARGE_OFF_T to be 9223372036854775807,
 | 
			
		||||
    since some C++ compilers masquerading as C compilers
 | 
			
		||||
    incorrectly reject 9223372036854775807.  */
 | 
			
		||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
 | 
			
		||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 | 
			
		||||
  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 | 
			
		||||
		       && LARGE_OFF_T % 2147483647 == 1)
 | 
			
		||||
		      ? 1 : -1];
 | 
			
		||||
@ -13413,7 +13402,7 @@ else
 | 
			
		||||
    We can't simply define LARGE_OFF_T to be 9223372036854775807,
 | 
			
		||||
    since some C++ compilers masquerading as C compilers
 | 
			
		||||
    incorrectly reject 9223372036854775807.  */
 | 
			
		||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
 | 
			
		||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 | 
			
		||||
  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 | 
			
		||||
		       && LARGE_OFF_T % 2147483647 == 1)
 | 
			
		||||
		      ? 1 : -1];
 | 
			
		||||
@ -13437,7 +13426,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 | 
			
		||||
    We can't simply define LARGE_OFF_T to be 9223372036854775807,
 | 
			
		||||
    since some C++ compilers masquerading as C compilers
 | 
			
		||||
    incorrectly reject 9223372036854775807.  */
 | 
			
		||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
 | 
			
		||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 | 
			
		||||
  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 | 
			
		||||
		       && LARGE_OFF_T % 2147483647 == 1)
 | 
			
		||||
		      ? 1 : -1];
 | 
			
		||||
@ -13482,7 +13471,7 @@ else
 | 
			
		||||
    We can't simply define LARGE_OFF_T to be 9223372036854775807,
 | 
			
		||||
    since some C++ compilers masquerading as C compilers
 | 
			
		||||
    incorrectly reject 9223372036854775807.  */
 | 
			
		||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
 | 
			
		||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 | 
			
		||||
  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 | 
			
		||||
		       && LARGE_OFF_T % 2147483647 == 1)
 | 
			
		||||
		      ? 1 : -1];
 | 
			
		||||
@ -13506,7 +13495,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 | 
			
		||||
    We can't simply define LARGE_OFF_T to be 9223372036854775807,
 | 
			
		||||
    since some C++ compilers masquerading as C compilers
 | 
			
		||||
    incorrectly reject 9223372036854775807.  */
 | 
			
		||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
 | 
			
		||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 | 
			
		||||
  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 | 
			
		||||
		       && LARGE_OFF_T % 2147483647 == 1)
 | 
			
		||||
		      ? 1 : -1];
 | 
			
		||||
@ -15478,6 +15467,7 @@ if test "${enable_all_static+set}" = set; then :
 | 
			
		||||
  enableval=$enable_all_static; enable_all_static_is=$enableval
 | 
			
		||||
else
 | 
			
		||||
  enable_all_static_is=no
 | 
			
		||||
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 if test "x${enable_all_static_is}" = "xyes"; then
 | 
			
		||||
@ -15489,11 +15479,24 @@ else
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Check whether --with-all-static-libs was given.
 | 
			
		||||
if test "${with_all_static_libs+set}" = set; then :
 | 
			
		||||
  withval=$with_all_static_libs;
 | 
			
		||||
else
 | 
			
		||||
  with_all_static_libs=
 | 
			
		||||
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
ALL_STATIC_LIBS="$with_all_static_libs"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Check whether --enable-ssl was given.
 | 
			
		||||
if test "${enable_ssl+set}" = set; then :
 | 
			
		||||
  enableval=$enable_ssl; enable_ssl_is=$enableval
 | 
			
		||||
else
 | 
			
		||||
  enable_ssl_is=yes
 | 
			
		||||
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if test "x$enable_ssl_is" = "xyes"
 | 
			
		||||
@ -19158,13 +19161,13 @@ fi
 | 
			
		||||
 | 
			
		||||
# Check whether --enable-wide-char was given.
 | 
			
		||||
if test "${enable_wide_char+set}" = set; then :
 | 
			
		||||
  enableval=$enable_wide_char; enable_wide_char=$enableval
 | 
			
		||||
  enableval=$enable_wide_char; enable_wide_char_is=$enableval
 | 
			
		||||
else
 | 
			
		||||
  enable_wide_char=yes
 | 
			
		||||
  enable_wide_char_is=yes
 | 
			
		||||
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if test "${enable_wide_char}" = "yes:4"
 | 
			
		||||
if test "${enable_wide_char_is}" = "yes:4"
 | 
			
		||||
then
 | 
			
		||||
 | 
			
		||||
$as_echo "#define HIO_WIDE_CHAR_SIZE 4" >>confdefs.h
 | 
			
		||||
@ -19176,7 +19179,7 @@ $as_echo "#define HIO_ENABLE_WIDE_CHAR 1" >>confdefs.h
 | 
			
		||||
	then
 | 
			
		||||
		CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
 | 
			
		||||
	fi
 | 
			
		||||
elif test "${enable_wide_char}" = "yes:2"
 | 
			
		||||
elif test "${enable_wide_char_is}" = "yes:2"
 | 
			
		||||
then
 | 
			
		||||
 | 
			
		||||
$as_echo "#define HIO_WIDE_CHAR_SIZE 2" >>confdefs.h
 | 
			
		||||
@ -19188,7 +19191,7 @@ $as_echo "#define HIO_ENABLE_WIDE_CHAR 1" >>confdefs.h
 | 
			
		||||
	then
 | 
			
		||||
		CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
 | 
			
		||||
	fi
 | 
			
		||||
elif test "${enable_wide_char}" = "yes"
 | 
			
		||||
elif test "${enable_wide_char_is}" = "yes"
 | 
			
		||||
then
 | 
			
		||||
 | 
			
		||||
$as_echo "#define HIO_WIDE_CHAR_SIZE 1" >>confdefs.h
 | 
			
		||||
@ -19200,12 +19203,12 @@ $as_echo "#define HIO_ENABLE_WIDE_CHAR 1" >>confdefs.h
 | 
			
		||||
	then
 | 
			
		||||
		CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
 | 
			
		||||
	fi
 | 
			
		||||
elif test "${enable_wide_char}" = "no:4"
 | 
			
		||||
elif test "${enable_wide_char_is}" = "no:4"
 | 
			
		||||
then
 | 
			
		||||
 | 
			
		||||
$as_echo "#define HIO_WIDE_CHAR_SIZE 4" >>confdefs.h
 | 
			
		||||
 | 
			
		||||
elif test "${enable_wide_char}" = "no:2"
 | 
			
		||||
elif test "${enable_wide_char_is}" = "no:2"
 | 
			
		||||
then
 | 
			
		||||
 | 
			
		||||
$as_echo "#define HIO_WIDE_CHAR_SIZE 2" >>confdefs.h
 | 
			
		||||
@ -20992,7 +20995,9 @@ $as_echo X/"$am_mf" |
 | 
			
		||||
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 | 
			
		||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 | 
			
		||||
as_fn_error $? "Something went wrong bootstrapping makefile fragments
 | 
			
		||||
    for automatic dependency tracking.  Try re-running configure with the
 | 
			
		||||
    for automatic dependency tracking.  If GNU make was not used, consider
 | 
			
		||||
    re-running the configure script with MAKE=\"gmake\" (or whatever is
 | 
			
		||||
    necessary).  You can also try re-running configure with the
 | 
			
		||||
    '--disable-dependency-tracking' option to at least be able to build
 | 
			
		||||
    the package (albeit without support for automatic dependency tracking).
 | 
			
		||||
See \`config.log' for more details" "$LINENO" 5; }
 | 
			
		||||
@ -21019,6 +21024,7 @@ See \`config.log' for more details" "$LINENO" 5; }
 | 
			
		||||
    cat <<_LT_EOF >> "$cfgfile"
 | 
			
		||||
#! $SHELL
 | 
			
		||||
# Generated automatically by $as_me ($PACKAGE) $VERSION
 | 
			
		||||
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 | 
			
		||||
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
 | 
			
		||||
 | 
			
		||||
# Provide generalized library-building support services.
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user