Merge branch 'master' of github.com:jthornber/thin-provisioning-tools
This commit is contained in:
commit
77902767d7
@ -119,6 +119,10 @@ else
|
|||||||
CXXLIB+=-lstdc++
|
CXXLIB+=-lstdc++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ("@STATIC@", "yes")
|
||||||
|
LDFLAGS+=-static
|
||||||
|
endif
|
||||||
|
|
||||||
INSTALL:=@INSTALL@
|
INSTALL:=@INSTALL@
|
||||||
PREFIX:=@prefix@
|
PREFIX:=@prefix@
|
||||||
BINDIR:=$(DESTDIR)$(PREFIX)/sbin
|
BINDIR:=$(DESTDIR)$(PREFIX)/sbin
|
||||||
|
@ -145,6 +145,14 @@ AC_ARG_ENABLE(static_cxx,
|
|||||||
STATIC_CXX=$enableval, STATIC_CXX=no)
|
STATIC_CXX=$enableval, STATIC_CXX=no)
|
||||||
AC_MSG_RESULT($STATIC_CXX)
|
AC_MSG_RESULT($STATIC_CXX)
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
dnl -- Enable static linking.
|
||||||
|
AC_MSG_CHECKING(whether to statically link)
|
||||||
|
AC_ARG_ENABLE(static,
|
||||||
|
AC_HELP_STRING(--enable-static, [enable static link]),
|
||||||
|
STATIC=$enableval, STATIC=no)
|
||||||
|
AC_MSG_RESULT($STATIC)
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
dnl -- Check for getopt
|
dnl -- Check for getopt
|
||||||
AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
|
AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
|
||||||
@ -173,6 +181,7 @@ AC_SUBST(RELEASE_DATE)
|
|||||||
AC_SUBST(TESTING)
|
AC_SUBST(TESTING)
|
||||||
AC_SUBST(THIN_PROVISIONING_TOOLS_VERSION)
|
AC_SUBST(THIN_PROVISIONING_TOOLS_VERSION)
|
||||||
AC_SUBST(STATIC_CXX)
|
AC_SUBST(STATIC_CXX)
|
||||||
|
AC_SUBST(STATIC)
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
dnl -- First and last lines should not contain files to generate in order to
|
dnl -- First and last lines should not contain files to generate in order to
|
||||||
|
Loading…
x
Reference in New Issue
Block a user