1
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-24 04:25:10 -07:00

Remove LIBTOOL_EXTRA_FLAGS and -fPIC (implicit) on Win32

This commit is contained in:
Frank Denis 2013-04-23 21:55:48 -07:00
parent e53b67924b
commit 52565edee1

View File

@ -42,11 +42,16 @@ AS_IF([test "$cross_compiling" != no],
AC_DEFINE(CROSS_COMPILING, [1], [define if you are cross-compiling]) AC_DEFINE(CROSS_COMPILING, [1], [define if you are cross-compiling])
) )
AX_CHECK_COMPILE_FLAG([-fPIC], [ case $host_os in
AX_CHECK_LINK_FLAG([-fPIC], cygwin* | mingw* | pw32* | cegcc*) ;;
[CFLAGS="$CFLAGS -fPIC"] *)
) AX_CHECK_COMPILE_FLAG([-fPIC], [
]) AX_CHECK_LINK_FLAG([-fPIC],
[CFLAGS="$CFLAGS -fPIC"]
)
])
;;
esac
AS_IF([test "$enable_pie" != "no"],[ AS_IF([test "$enable_pie" != "no"],[
AX_CHECK_COMPILE_FLAG([-fPIE], [ AX_CHECK_COMPILE_FLAG([-fPIE], [
@ -65,7 +70,6 @@ AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], [CFLAGS="$CFLAGS -fno-strict-overf
LIBTOOL_EXTRA_FLAGS="-version-info $SODIUM_LIBRARY_VERSION" LIBTOOL_EXTRA_FLAGS="-version-info $SODIUM_LIBRARY_VERSION"
case $host_os in case $host_os in
cygwin* | mingw* | pw32* | cegcc*) cygwin* | mingw* | pw32* | cegcc*)
LIBTOOL_EXTRA_FLAGS="-module -avoid-version"
AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [LDFLAGS="$LDFLAGS -Wl,--dynamicbase"]) AX_CHECK_LINK_FLAG([-Wl,--dynamicbase], [LDFLAGS="$LDFLAGS -Wl,--dynamicbase"])
AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"]) AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"])
;; ;;