cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Output .DEF file on Win32

Browse Source
This commit is contained in:
Frank Denis 2013-04-23 21:24:35 -07:00
parent 8dcebd3590
commit 655a9589b8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -15,7 +15,7 @@ AC_SUBST(ISODATE)
SODIUM_LIBRARY_VERSION_MAJOR=4 SODIUM_LIBRARY_VERSION_MAJOR=4
SODIUM_LIBRARY_VERSION_MINOR=0 SODIUM_LIBRARY_VERSION_MINOR=0
DLL_VERSION=4
SODIUM_LIBRARY_VERSION=4:0:0 SODIUM_LIBRARY_VERSION=4:0:0
# | | | # | | |
# +------+ | +---+ # +------+ | +---+
@ -31,6 +31,7 @@ SODIUM_LIBRARY_VERSION=4:0:0
AC_SUBST(SODIUM_LIBRARY_VERSION_MAJOR) AC_SUBST(SODIUM_LIBRARY_VERSION_MAJOR)
AC_SUBST(SODIUM_LIBRARY_VERSION_MINOR) AC_SUBST(SODIUM_LIBRARY_VERSION_MINOR)
AC_SUBST(SODIUM_LIBRARY_VERSION) AC_SUBST(SODIUM_LIBRARY_VERSION)
AC_SUBST(DLL_VERSION)
LX_CFLAGS=${CFLAGS-NONE} LX_CFLAGS=${CFLAGS-NONE}
AC_PROG_CC_C99 AC_PROG_CC_C99
@ -132,6 +133,7 @@ AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]
LT_INIT LT_INIT
AC_SUBST(LIBTOOL_DEPS) AC_SUBST(LIBTOOL_DEPS)
gl_LD_OUTPUT_DEF
AC_ARG_VAR([AR], [path to the ar utility]) AC_ARG_VAR([AR], [path to the ar utility])
AC_CHECK_TOOL([AR], [ar], [ar]) AC_CHECK_TOOL([AR], [ar], [ar])

7
src/libsodium/Makefile.am
View File

@ -180,5 +180,12 @@ libsodium_la_CPPFLAGS = \
-I$(srcdir)/include/sodium \ -I$(srcdir)/include/sodium \
-I$(builddir)/include/sodium -I$(builddir)/include/sodium
if HAVE_LD_OUTPUT_DEF
libsodium_la_LDFLAGS += -Wl,--output-def,libsodium-$(DLL_VERSION).def
defexecdir = $(bindir)
defexec_DATA = libsodium-$(DLL_VERSION).def
DISTCLEANFILES += $(defexec_DATA)
endif
SUBDIRS = \ SUBDIRS = \
include include