moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 05:18:16 -05:00
Code Issues Releases Wiki Activity

Make building of pacman.static optional

Browse Source 
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:
Dan McGee 2007-11-01 19:36:50 -05:00
parent c26fe63ee5
commit e5be26fb23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -118,6 +118,11 @@ AC_ARG_ENABLE(abs,
AC_HELP_STRING([--disable-abs], [do not include Arch Linux Build System script]), AC_HELP_STRING([--disable-abs], [do not include Arch Linux Build System script]),
[includeabs=$enableval], [includeabs=yes]) [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. # Checks for programs.
AC_PROG_AWK AC_PROG_AWK
AC_PROG_CC_C99 AC_PROG_CC_C99
@ -278,6 +283,16 @@ else
fi fi
AM_CONDITIONAL(INCLUDE_ABS, test "x$includeabs" = "xyes") 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 # Set root directory
AC_SUBST(ROOTDIR) AC_SUBST(ROOTDIR)
# Set package file extension # Set package file extension
@ -341,6 +356,7 @@ pacman_display_version:
Asciidoc support : ${useasciidoc} Asciidoc support : ${useasciidoc}
debug support : ${debug} debug support : ${debug}
include abs : ${includeabs} include abs : ${includeabs}
build pacman.static : ${pacmanstatic}
" "
# vim:set ts=2 sw=2 noet: # vim:set ts=2 sw=2 noet:

6
src/pacman/Makefile.am
View File

@ -3,7 +3,11 @@ conffile = ${sysconfdir}/pacman.conf
dbpath = ${localstatedir}/lib/pacman/ dbpath = ${localstatedir}/lib/pacman/
cachedir = ${localstatedir}/cache/pacman/pkg/ 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@\" \ DEFS = -DLOCALEDIR=\"@localedir@\" \
-DCONFFILE=\"$(conffile)\" \ -DCONFFILE=\"$(conffile)\" \