fix: Make installing of shared libraries work again. (#1014)
Addresses a regression in #989. Fixes #1013.
Этот коммит содержится в:
родитель
37aba7944d
Коммит
51a4c631a4
@ -1,8 +1,9 @@
|
|||||||
# Also link binaries as static
|
# Also link binaries as static
|
||||||
AC_ARG_ENABLE([static-bin],
|
AC_ARG_ENABLE([static-bin],
|
||||||
AS_HELP_STRING([--enable-static-bin], [link iperf3 binary statically]),
|
AS_HELP_STRING([--enable-static-bin], [link iperf3 binary statically]),
|
||||||
[enable_static_bin=yes
|
[enable_static=yes
|
||||||
AC_DISABLE_SHARED],
|
enable_shared=no
|
||||||
|
enable_static_bin=yes],
|
||||||
[:])
|
[:])
|
||||||
AM_CONDITIONAL([ENABLE_STATIC_BIN], [test x$enable_static_bin = xno])
|
AM_CONDITIONAL([ENABLE_STATIC_BIN], [test x$enable_static_bin = xno])
|
||||||
|
|
||||||
|
77
configure
поставляемый
77
configure
поставляемый
@ -763,8 +763,8 @@ ac_subst_files=''
|
|||||||
ac_user_opts='
|
ac_user_opts='
|
||||||
enable_option_checking
|
enable_option_checking
|
||||||
enable_static_bin
|
enable_static_bin
|
||||||
enable_shared
|
|
||||||
enable_silent_rules
|
enable_silent_rules
|
||||||
|
enable_shared
|
||||||
enable_static
|
enable_static
|
||||||
with_pic
|
with_pic
|
||||||
enable_fast_install
|
enable_fast_install
|
||||||
@ -1407,9 +1407,9 @@ Optional Features:
|
|||||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||||
--enable-static-bin link iperf3 binary statically
|
--enable-static-bin link iperf3 binary statically
|
||||||
--enable-shared[=PKGS] build shared libraries [default=no]
|
|
||||||
--enable-silent-rules less verbose build output (undo: "make V=1")
|
--enable-silent-rules less verbose build output (undo: "make V=1")
|
||||||
--disable-silent-rules verbose build output (undo: "make V=0")
|
--disable-silent-rules verbose build output (undo: "make V=0")
|
||||||
|
--enable-shared[=PKGS] build shared libraries [default=yes]
|
||||||
--enable-static[=PKGS] build static libraries [default=yes]
|
--enable-static[=PKGS] build static libraries [default=yes]
|
||||||
--enable-fast-install[=PKGS]
|
--enable-fast-install[=PKGS]
|
||||||
optimize for fast installation [default=yes]
|
optimize for fast installation [default=yes]
|
||||||
@ -2293,38 +2293,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||||||
# Also link binaries as static
|
# Also link binaries as static
|
||||||
# Check whether --enable-static-bin was given.
|
# Check whether --enable-static-bin was given.
|
||||||
if test "${enable_static_bin+set}" = set; then :
|
if test "${enable_static_bin+set}" = set; then :
|
||||||
enableval=$enable_static_bin; enable_static_bin=yes
|
enableval=$enable_static_bin; enable_static=yes
|
||||||
# Check whether --enable-shared was given.
|
enable_shared=no
|
||||||
if test "${enable_shared+set}" = set; then :
|
enable_static_bin=yes
|
||||||
enableval=$enable_shared; p=${PACKAGE-default}
|
|
||||||
case $enableval in
|
|
||||||
yes) enable_shared=yes ;;
|
|
||||||
no) enable_shared=no ;;
|
|
||||||
*)
|
|
||||||
enable_shared=no
|
|
||||||
# Look at the argument we got. We use all the common list separators.
|
|
||||||
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
|
||||||
for pkg in $enableval; do
|
|
||||||
IFS=$lt_save_ifs
|
|
||||||
if test "X$pkg" = "X$p"; then
|
|
||||||
enable_shared=yes
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS=$lt_save_ifs
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
enable_shared=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
else
|
else
|
||||||
:
|
:
|
||||||
fi
|
fi
|
||||||
@ -7824,6 +7795,36 @@ done
|
|||||||
enable_win32_dll=no
|
enable_win32_dll=no
|
||||||
|
|
||||||
|
|
||||||
|
# Check whether --enable-shared was given.
|
||||||
|
if test "${enable_shared+set}" = set; then :
|
||||||
|
enableval=$enable_shared; p=${PACKAGE-default}
|
||||||
|
case $enableval in
|
||||||
|
yes) enable_shared=yes ;;
|
||||||
|
no) enable_shared=no ;;
|
||||||
|
*)
|
||||||
|
enable_shared=no
|
||||||
|
# Look at the argument we got. We use all the common list separators.
|
||||||
|
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||||
|
for pkg in $enableval; do
|
||||||
|
IFS=$lt_save_ifs
|
||||||
|
if test "X$pkg" = "X$p"; then
|
||||||
|
enable_shared=yes
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS=$lt_save_ifs
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
enable_shared=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-static was given.
|
# Check whether --enable-static was given.
|
||||||
if test "${enable_static+set}" = set; then :
|
if test "${enable_static+set}" = set; then :
|
||||||
@ -14769,9 +14770,9 @@ AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
|
|||||||
sed_quote_subst='$sed_quote_subst'
|
sed_quote_subst='$sed_quote_subst'
|
||||||
double_quote_subst='$double_quote_subst'
|
double_quote_subst='$double_quote_subst'
|
||||||
delay_variable_subst='$delay_variable_subst'
|
delay_variable_subst='$delay_variable_subst'
|
||||||
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
|
|
||||||
macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
|
macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
|
||||||
macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
|
macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
|
||||||
|
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
|
||||||
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
|
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
|
||||||
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
|
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
|
||||||
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
|
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
|
||||||
@ -15803,13 +15804,13 @@ available_tags=''
|
|||||||
|
|
||||||
# ### BEGIN LIBTOOL CONFIG
|
# ### BEGIN LIBTOOL CONFIG
|
||||||
|
|
||||||
# Whether or not to build shared libraries.
|
|
||||||
build_libtool_libs=$enable_shared
|
|
||||||
|
|
||||||
# Which release of libtool.m4 was used?
|
# Which release of libtool.m4 was used?
|
||||||
macro_version=$macro_version
|
macro_version=$macro_version
|
||||||
macro_revision=$macro_revision
|
macro_revision=$macro_revision
|
||||||
|
|
||||||
|
# Whether or not to build shared libraries.
|
||||||
|
build_libtool_libs=$enable_shared
|
||||||
|
|
||||||
# Whether or not to build static libraries.
|
# Whether or not to build static libraries.
|
||||||
build_old_libs=$enable_static
|
build_old_libs=$enable_static
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user