Browse Source

We don't need libltdl

next
Frank Denis 11 years ago
parent
commit
9131967397
  1. 3
      .gitignore
  2. 1
      Makefile.am
  3. 2
      autogen.sh
  4. 3
      configure.ac
  5. 2
      dist-build/msys.sh

3
.gitignore

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

1
Makefile.am

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

2
autogen.sh

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

3
configure.ac

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

2
dist-build/msys.sh

@ -1,4 +1,4 @@
#! /bin/sh
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

Loading…
Cancel
Save