shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-17 06:04:23 +03:00
Code Releases Activity

Fix problems with static build

Browse Source 
- compiler warning (missing header)

 - configure should set static flag early to be able
   use STATIC_LINK flag during configure script
This commit is contained in:
Milan Broz 2009-01-20 17:07:53 +00:00
parent 6baf973742
commit 9c961554c4
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -1323,6 +1323,8 @@ if test -n "$ac_init_help"; then
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-static_link Use this to link the tools to their libraries
statically. Default is dynamic linking
--enable-lvm1_fallback Use this to fall back and use LVM1 binaries if
device-mapper is missing from the kernel
--disable-readline Disable readline support
@ -1337,8 +1339,6 @@ Optional Features:
--enable-pkgconfig Install pkgconfig support
--enable-fsadm Enable fsadm
--enable-dmeventd Enable the device-mapper event daemon
--enable-static_link Use this to link the tools to their libraries
statically. Default is dynamic linking
--disable-selinux Disable selinux support
--enable-nls Enable Native Language Support
@ -8397,6 +8397,19 @@ done
################################################################################
{ echo "$as_me:$LINENO: checking whether to use static linking" >&5
echo $ECHO_N "checking whether to use static linking... $ECHO_C" >&6; }
# Check whether --enable-static_link was given.
if test "${enable_static_link+set}" = set; then
enableval=$enable_static_link; STATIC_LINK=$enableval
else
STATIC_LINK=no
fi
{ echo "$as_me:$LINENO: result: $STATIC_LINK" >&5
echo "${ECHO_T}$STATIC_LINK" >&6; }
################################################################################
@ -9307,19 +9320,6 @@ echo "$as_me: error: Features cannot be 'shared' when building statically
{ (exit 1); exit 1; }; }
fi
################################################################################
{ echo "$as_me:$LINENO: checking whether to use static linking" >&5
echo $ECHO_N "checking whether to use static linking... $ECHO_C" >&6; }
# Check whether --enable-static_link was given.
if test "${enable_static_link+set}" = set; then
enableval=$enable_static_link; STATIC_LINK=$enableval
else
STATIC_LINK=no
fi
{ echo "$as_me:$LINENO: result: $STATIC_LINK" >&5
echo "${ECHO_T}$STATIC_LINK" >&6; }
################################################################################
{ echo "$as_me:$LINENO: checking whether to enable selinux support" >&5
echo $ECHO_N "checking whether to enable selinux support... $ECHO_C" >&6; }
@ -10609,7 +10609,7 @@ if test "$ac_res" != no; then
ac_cv_func_getmntent=yes
cat >>confdefs.h <<\_ACEOF
#define HAVE_GETMNTENT
#define HAVE_GETMNTENT 1
_ACEOF
else

18
configure.in
View File

@ -128,6 +128,15 @@ AC_FUNC_STAT
AC_FUNC_STRTOD
AC_FUNC_VPRINTF
################################################################################
dnl -- Enables statically-linked tools
AC_MSG_CHECKING(whether to use static linking)
AC_ARG_ENABLE(static_link,
[ --enable-static_link Use this to link the tools to their libraries
statically. Default is dynamic linking],
STATIC_LINK=$enableval, STATIC_LINK=no)
AC_MSG_RESULT($STATIC_LINK)
################################################################################
dnl -- Prefix is /usr by default, the exec_prefix default is setup later
AC_PREFIX_DEFAULT(/usr)
@ -508,15 +517,6 @@ Features cannot be 'shared' when building statically
)
fi
################################################################################
dnl -- Enables statically-linked tools
AC_MSG_CHECKING(whether to use static linking)
AC_ARG_ENABLE(static_link,
[ --enable-static_link Use this to link the tools to their libraries
statically. Default is dynamic linking],
STATIC_LINK=$enableval, STATIC_LINK=no)
AC_MSG_RESULT($STATIC_LINK)
################################################################################
dnl -- Disable selinux
AC_MSG_CHECKING(whether to enable selinux support)

1
tools/lvm-static.c
View File

@ -14,6 +14,7 @@
*/
#include "lvm2cmdline.h"
#include "lib.h"
int main(int argc, char **argv)
{