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

libtoolize and get ready for a lot of autotools fun. Not.

Browse Source
This commit is contained in:
Frank Denis 2013-01-19 16:37:13 -08:00
parent b7075c1d9f
commit e770e627dd
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autogen.sh
View File

@ -4,8 +4,14 @@ if [ -x "`which autoreconf 2>/dev/null`" ] ; then
exec autoreconf -ivf exec autoreconf -ivf
fi fi
if glibtoolize --version > /dev/null 2>&1; then
LIBTOOLIZE='glibtoolize'
else
LIBTOOLIZE='libtoolize'
fi
$LIBTOOLIZE --ltdl && \
aclocal && \ aclocal && \
autoheader && \ autoheader && \
automake --add-missing --force-missing --include-deps && \ automake --add-missing --force-missing --include-deps && \
autoconf autoconf

12
configure.ac
View File

@ -1,6 +1,7 @@
AC_PREREQ([2.61]) AC_PREREQ([2.61])
AC_INIT([nacl-ref],[0.0.1],[https://github.com/jedisct1/nacl-ref]) AC_INIT([libnacl-ref],[0.0.1],[https://github.com/jedisct1/nacl-ref])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([libltdl/config])
AC_CONFIG_SRCDIR([src/libnacl/PROTOTYPES.c]) AC_CONFIG_SRCDIR([src/libnacl/PROTOTYPES.c])
AC_CONFIG_HEADER([config.h]) AC_CONFIG_HEADER([config.h])
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -115,6 +116,9 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"]) AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"]) AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
LT_INIT
AC_SUBST(LIBTOOL_DEPS)
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])
@ -184,6 +188,12 @@ NACL_PATH=libnacl/build/${NACL_HOSTNAME}
AC_SUBST([MAINT]) AC_SUBST([MAINT])
AC_SUBST([NACL_PATH]) AC_SUBST([NACL_PATH])
dnl Libtool.
LT_INIT([dlopen])
LT_CONFIG_LTDL_DIR([libltdl])
LTDL_INIT
dnl Output. dnl Output.
AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */ AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */