mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Remove the --enable-static-nix flag.

Browse source
This commit is contained in:
Eelco Dolstra 2010-03-02 16:40:40 +00:00
parent 594eaddd11
commit 5414b3b2db
1 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
configure.ac
View file

@ -50,38 +50,24 @@ AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier (`cpu-os')])
test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var
# Whether to produce a statically linked binary. On Cygwin, this is # Windows-specific stuff. On Cygwin, dynamically linking against the
# the default: dynamically linking against the ATerm DLL does work, # ATerm DLL works, except that it requires the ATerm "lib" directory
# except that it requires the ATerm "lib" directory to be in $PATH, as # to be in $PATH, as Windows doesn't have anything like an RPATH
# Windows doesn't have anything like an RPATH embedded in executable. # embedded in executable. Since this is kind of annoying, we use
# Since this is kind of annoying, we use static libraries for now. # static libraries for now.
if test "$sys_name" = "cygwin"; then
AC_ARG_ENABLE(static-nix, AC_HELP_STRING([--enable-static-nix],
[produce statically linked binaries]),
static_nix=$enableval, static_nix=no)
if test "$sys_name" = cygwin; then
static_nix=yes
fi
if test "$static_nix" = yes; then
AC_DISABLE_SHARED AC_DISABLE_SHARED
AC_ENABLE_STATIC AC_ENABLE_STATIC
fi fi
# Windows-specific stuff.
if test "$sys_name" = "cygwin"; then
# We cannot delete open files.
AC_DEFINE(CANNOT_DELETE_OPEN_FILES, 1, [Whether it is impossible to delete open files.])
fi
# Solaris-specific stuff. # Solaris-specific stuff.
if test "$sys_name" = "sunos"; then if test "$sys_name" = "sunos"; then
# Solaris requires -lsocket -lnsl for network functions # Solaris requires -lsocket -lnsl for network functions
LIBS="-lsocket -lnsl $LIBS" LIBS="-lsocket -lnsl $LIBS"
fi fi
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
@ -291,14 +277,6 @@ if test "$(uname)" = "Darwin"; then
fi fi
if test "$static_nix" = yes; then
# `-all-static' has to be added at the end of configure, because
# the C compiler doesn't know about -all-static (it's filtered out
# by libtool, but configure doesn't use libtool).
LDFLAGS="-all-static $LDFLAGS"
fi
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
externals/Makefile externals/Makefile