kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-23 20:15:19 -07:00
Code Releases Wiki Activity

We don't need libltdl

Browse Source
This commit is contained in:
Frank Denis 2013-04-25 22:51:19 -07:00
parent 8574a58488
commit 9131967397
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -25,12 +25,10 @@ config.*
configure configure
depcomp depcomp
install-sh install-sh
libltdl
libtool libtool
ltmain.sh ltmain.sh
m4/argz.m4 m4/argz.m4
m4/libtool.m4 m4/libtool.m4
m4/ltdl.m4
m4/ltoptions.m4 m4/ltoptions.m4
m4/ltsugar.m4 m4/ltsugar.m4
m4/ltversion.m4 m4/ltversion.m4
@ -87,5 +85,6 @@ test/default/stream
test/default/stream2 test/default/stream2
test/default/stream3 test/default/stream3
test/default/stream4 test/default/stream4
test-driver
testing testing

1
Makefile.am
View File

@ -7,6 +7,5 @@ EXTRA_DIST = \
THANKS THANKS
SUBDIRS = \ SUBDIRS = \
libltdl \
src \ src \
test test

2
autogen.sh
View File

@ -10,7 +10,7 @@ else
LIBTOOLIZE='libtoolize' LIBTOOLIZE='libtoolize'
fi fi
$LIBTOOLIZE --ltdl && \ $LIBTOOLIZE && \
aclocal && \ aclocal && \
automake --add-missing --force-missing --include-deps && \ automake --add-missing --force-missing --include-deps && \
autoconf autoconf

3
configure.ac
View File

@ -1,7 +1,6 @@
AC_PREREQ([2.61]) AC_PREREQ([2.61])
AC_INIT([libsodium],[0.4.1],[https://github.com/jedisct1/libsodium]) AC_INIT([libsodium],[0.4.1],[https://github.com/jedisct1/libsodium])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([libltdl/config])
AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c]) AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c])
AC_CANONICAL_HOST AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar]) AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar])
@ -283,8 +282,6 @@ AC_SUBST([LIBTOOL_EXTRA_FLAGS])
dnl Libtool. dnl Libtool.
LT_INIT([dlopen]) LT_INIT([dlopen])
LT_CONFIG_LTDL_DIR([libltdl])
LTDL_INIT
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
gl_LD_OUTPUT_DEF gl_LD_OUTPUT_DEF

2
dist-build/msys.sh
View File

@ -1,4 +1,4 @@
#! /bin/sh #! /bin/sh
export CFLAGS="-O3 -fomit-frame-pointer -march=pentium2 -mtune=nocona" export CFLAGS="-O3 -fomit-frame-pointer -march=pentium2 -mtune=nocona"
./configure --with-included-ltdl && make && make check && make install ./configure && make && make check && make install