mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-22 15:58:50 -05:00
Make building of pacman.static optional
Because building of pacman.static fails on some platforms, we should make it optional. It is enabled by default but can be disabled with the use of the --disable-pacman-static flag. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
c26fe63ee5
commit
e5be26fb23
16
configure.ac
16
configure.ac
@ -118,6 +118,11 @@ AC_ARG_ENABLE(abs,
|
||||
AC_HELP_STRING([--disable-abs], [do not include Arch Linux Build System script]),
|
||||
[includeabs=$enableval], [includeabs=yes])
|
||||
|
||||
# Help line for pacman.static
|
||||
AC_ARG_ENABLE(pacman-static,
|
||||
AC_HELP_STRING([--disable-pacman-static], [do not build static version of pacman]),
|
||||
[pacmanstatic=$enableval], [pacmanstatic=yes])
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_AWK
|
||||
AC_PROG_CC_C99
|
||||
@ -278,6 +283,16 @@ else
|
||||
fi
|
||||
AM_CONDITIONAL(INCLUDE_ABS, test "x$includeabs" = "xyes")
|
||||
|
||||
# Enable or disable inclusion of abs script
|
||||
AC_MSG_CHECKING(whether to build pacman.static)
|
||||
if test "x$pacmanstatic" = "xyes" ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([INCLUDE_PACMAN_STATIC], , [Build pacman.static])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
AM_CONDITIONAL(INCLUDE_PACMAN_STATIC, test "x$pacmanstatic" = "xyes")
|
||||
|
||||
# Set root directory
|
||||
AC_SUBST(ROOTDIR)
|
||||
# Set package file extension
|
||||
@ -341,6 +356,7 @@ pacman_display_version:
|
||||
Asciidoc support : ${useasciidoc}
|
||||
debug support : ${debug}
|
||||
include abs : ${includeabs}
|
||||
build pacman.static : ${pacmanstatic}
|
||||
"
|
||||
|
||||
# vim:set ts=2 sw=2 noet:
|
||||
|
@ -3,7 +3,11 @@ conffile = ${sysconfdir}/pacman.conf
|
||||
dbpath = ${localstatedir}/lib/pacman/
|
||||
cachedir = ${localstatedir}/cache/pacman/pkg/
|
||||
|
||||
bin_PROGRAMS = pacman pacman.static
|
||||
bin_PROGRAMS = pacman
|
||||
|
||||
if INCLUDE_PACMAN_STATIC
|
||||
bin_PROGRAMS += pacman.static
|
||||
endif
|
||||
|
||||
DEFS = -DLOCALEDIR=\"@localedir@\" \
|
||||
-DCONFFILE=\"$(conffile)\" \
|
||||
|
Loading…
Reference in New Issue
Block a user