aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-25 01:05:37 +00:00
Code

[static] Added --with-static option

Browse Source
This commit is contained in:
Witold Filipczyk 2020-11-09 22:04:48 +01:00
parent 000b391c2d
commit 6171e286bd
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
configure.ac
View File

@ -130,6 +130,21 @@ if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -Wall"
fi fi
# ===================================================================
# static binary
# ===================================================================
enable_static=no
PKG_CONFIG_STATIC=
AC_ARG_WITH(static, [ --with-static enable build of static binary],
[ if test "x$withval" != xno; then enable_static=yes; fi ])
if test "$enable_static" = yes; then
CFLAGS="$CFLAGS -static"
PKG_CONFIG_STATIC="--static"
fi
# =================================================================== # ===================================================================
# Checks for special OSes. # Checks for special OSes.
# =================================================================== # ===================================================================
@ -509,9 +524,9 @@ if test "$enable_brotli" = no; then
AC_MSG_RESULT([[disabled]]) AC_MSG_RESULT([[disabled]])
else else
AC_MSG_CHECKING([[for brotli in pkg-config]]) AC_MSG_CHECKING([[for brotli in pkg-config]])
if $PKG_CONFIG libbrotlidec; then if $PKG_CONFIG $PKG_CONFIG_STATIC libbrotlidec; then
BROTLI_CFLAGS=`$PKG_CONFIG --cflags libbrotlidec` BROTLI_CFLAGS=`$PKG_CONFIG $PKG_CONFIG_STATIC --cflags libbrotlidec`
BROTLI_LIBS=`$PKG_CONFIG --libs libbrotlidec` BROTLI_LIBS=`$PKG_CONFIG $PKG_CONFIG_STATIC --libs libbrotlidec`
LIBS="$BROTLI_LIBS $LIBS" LIBS="$BROTLI_LIBS $LIBS"
CONFIG_BROTLI=yes CONFIG_BROTLI=yes
AC_DEFINE([CONFIG_BROTLI], [1], [Define as 1 to use the libbrotli library.]) AC_DEFINE([CONFIG_BROTLI], [1], [Define as 1 to use the libbrotli library.])
@ -646,9 +661,9 @@ for package in mozjs-52; do
break break
else else
AC_MSG_CHECKING([for SpiderMonkey (mozjs-52) in pkg-config $package]) AC_MSG_CHECKING([for SpiderMonkey (mozjs-52) in pkg-config $package])
if $PKG_CONFIG --cflags --libs $package > /dev/null 2>&AS_MESSAGE_LOG_FD; then if $PKG_CONFIG $PKG_CONFIG_STATIC --cflags --libs $package > /dev/null 2>&AS_MESSAGE_LOG_FD; then
SPIDERMONKEY_LIBS="$($PKG_CONFIG --libs $package)" SPIDERMONKEY_LIBS="$($PKG_CONFIG $PKG_CONFIG_STATIC --libs $package)"
SPIDERMONKEY_CFLAGS="$($PKG_CONFIG --cflags $package)" SPIDERMONKEY_CFLAGS="$($PKG_CONFIG $PKG_CONFIG_STATIC --cflags $package)"
LIBS="$SPIDERMONKEY_LIBS $LIBS_X" LIBS="$SPIDERMONKEY_LIBS $LIBS_X"
CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS" CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS"
CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS" CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS"
@ -911,9 +926,9 @@ AC_MSG_CHECKING([for Lua])
EL_SAVE_FLAGS EL_SAVE_FLAGS
cf_result=no cf_result=no
if test -n "$luapkg" && $PKG_CONFIG "$luapkg"; then if test -n "$luapkg" && $PKG_CONFIG $PKG_CONFIG_STATIC "$luapkg"; then
LUA_CFLAGS=`$PKG_CONFIG --cflags "$luapkg"` LUA_CFLAGS=`$PKG_CONFIG $PKG_CONFIG_STATIC --cflags "$luapkg"`
LUA_LIBS=`$PKG_CONFIG --libs "$luapkg"` LUA_LIBS=`$PKG_CONFIG $PKG_CONFIG_STATIC --libs "$luapkg"`
CFLAGS="$CFLAGS_X $LUA_CFLAGS" CFLAGS="$CFLAGS_X $LUA_CFLAGS"
CPPFLAGS="$CPPFLAGS_X $LUA_CFLAGS" CPPFLAGS="$CPPFLAGS_X $LUA_CFLAGS"
LIBS="$LUA_LIBS $LIBS_X" LIBS="$LUA_LIBS $LIBS_X"
@ -964,9 +979,9 @@ if test "$with_tre" = no; then
tre_log="no (explicitly disabled)" tre_log="no (explicitly disabled)"
else else
AC_MSG_CHECKING([[for TRE in pkg-config]]) AC_MSG_CHECKING([[for TRE in pkg-config]])
if $PKG_CONFIG tre; then if $PKG_CONFIG $PKG_CONFIG_STATIC tre; then
TRE_CFLAGS=`$PKG_CONFIG --cflags tre` TRE_CFLAGS=`$PKG_CONFIG $PKG_CONFIG_STATIC --cflags tre`
TRE_LIBS=`$PKG_CONFIG --libs tre` TRE_LIBS=`$PKG_CONFIG $PKG_CONFIG_STATIC --libs tre`
AC_MSG_RESULT([[yes]]) AC_MSG_RESULT([[yes]])
else else
# <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=513055> # <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=513055>
@ -1032,7 +1047,7 @@ AC_ARG_WITH(gnutls, [[ --with-gnutls enable GNUTLS SSL support]],
"yes") chosen_ssl_library="GNUTLS" ;; "yes") chosen_ssl_library="GNUTLS" ;;
*) chosen_ssl_library="GNUTLS" *) chosen_ssl_library="GNUTLS"
AC_MSG_WARN([[Support for --with-gnutls=DIR has been removed. AC_MSG_WARN([[Support for --with-gnutls=DIR has been removed.
You may have to set the PKG_CONFIG_PATH environment variable instead.]]) ;; You may have to set the PKG_CONFIG $PKG_CONFIG_STATIC_PATH environment variable instead.]]) ;;
esac]) esac])
AC_ARG_WITH(openssl, [[ --without-openssl disable OpenSSL support]]) AC_ARG_WITH(openssl, [[ --without-openssl disable OpenSSL support]])
@ -1066,9 +1081,9 @@ elif test -z "${with_nss_compat_ossl+set}"; then
else else
EL_SAVE_FLAGS EL_SAVE_FLAGS
if test "$with_nss_compat_ossl" = yes; then if test "$with_nss_compat_ossl" = yes; then
if $PKG_CONFIG nss; then if $PKG_CONFIG $PKG_CONFIG_STATIC nss; then
CFLAGS="$CFLAGS_X `$PKG_CONFIG --cflags nss`" CFLAGS="$CFLAGS_X `$PKG_CONFIG $PKG_CONFIG_STATIC --cflags nss`"
LIBS="$LIBS_X `$PKG_CONFIG --libs nss`" LIBS="$LIBS_X `$PKG_CONFIG $PKG_CONFIG_STATIC --libs nss`"
else else
with_nss_compat_ossl=no with_nss_compat_ossl=no
fi fi
@ -1165,9 +1180,9 @@ elif test -n "$chosen_ssl_library" && test "$chosen_ssl_library" != "GNUTLS"; th
else else
cf_result=no cf_result=no
AC_MSG_CHECKING([[for GNUTLS (1.2 or later) in pkg-config]]) AC_MSG_CHECKING([[for GNUTLS (1.2 or later) in pkg-config]])
if $PKG_CONFIG --atleast-version=1.2 gnutls; then if $PKG_CONFIG $PKG_CONFIG_STATIC --atleast-version=1.2 gnutls; then
GNUTLS_CFLAGS=`$PKG_CONFIG --cflags gnutls` GNUTLS_CFLAGS=`$PKG_CONFIG $PKG_CONFIG_STATIC --cflags gnutls`
GNUTLS_LIBS=`$PKG_CONFIG --libs gnutls` GNUTLS_LIBS=`$PKG_CONFIG $PKG_CONFIG_STATIC --libs gnutls`
AC_MSG_RESULT([[yes: $GNUTLS_CFLAGS $GNUTLS_LIBS]]) AC_MSG_RESULT([[yes: $GNUTLS_CFLAGS $GNUTLS_LIBS]])
EL_SAVE_FLAGS EL_SAVE_FLAGS
@ -1630,9 +1645,9 @@ if test "$enable_libdom" = no; then
AC_MSG_RESULT([[disabled]]) AC_MSG_RESULT([[disabled]])
else else
AC_MSG_CHECKING([[for libdom in pkg-config]]) AC_MSG_CHECKING([[for libdom in pkg-config]])
if $PKG_CONFIG libdom; then if $PKG_CONFIG $PKG_CONFIG_STATIC libdom; then
LIBDOM_CFLAGS=`$PKG_CONFIG --cflags libdom` LIBDOM_CFLAGS=`$PKG_CONFIG $PKG_CONFIG_STATIC --cflags libdom`
LIBDOM_LIBS=`$PKG_CONFIG --libs libdom` LIBDOM_LIBS=`$PKG_CONFIG $PKG_CONFIG_STATIC --libs libdom`
LIBS="$LIBDOM_LIBS $LIBS" LIBS="$LIBDOM_LIBS $LIBS"
CONFIG_LIBDOM=yes CONFIG_LIBDOM=yes
AC_DEFINE([CONFIG_LIBDOM], [1], [Define as 1 to use the libdom library.]) AC_DEFINE([CONFIG_LIBDOM], [1], [Define as 1 to use the libdom library.])
@ -1688,11 +1703,14 @@ test "$CONFIG_OS_OS2" = yes && LDFLAGS=`echo "$LDFLAGS" | sed "s/-Zbin-files//g"
# linker from finding the libraries listed in -l operands. So this # linker from finding the libraries listed in -l operands. So this
# -rdynamic check needs to happen after the libraries have already # -rdynamic check needs to happen after the libraries have already
# been added to $LDFLAGS. # been added to $LDFLAGS.
have_rdynamic=no
AC_MSG_CHECKING([for -rdynamic]) AC_MSG_CHECKING([for -rdynamic])
LDFLAGS_X="$LDFLAGS" if test "$enable_static" = no; then
LDFLAGS="-rdynamic $LDFLAGS" LDFLAGS_X="$LDFLAGS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[have_rdynamic=yes],[have_rdynamic=no]) LDFLAGS="-rdynamic $LDFLAGS"
test "$have_rdynamic" = no && LDFLAGS="$LDFLAGS_X" AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[have_rdynamic=yes],[have_rdynamic=no])
test "$have_rdynamic" = no && LDFLAGS="$LDFLAGS_X"
fi
AC_MSG_RESULT($have_rdynamic) AC_MSG_RESULT($have_rdynamic)
# =================================================================== # ===================================================================