diff options
| author | Dan McGee <dan@archlinux.org> | 2007-11-02 01:36:50 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-11-04 17:42:08 +0100 |
| commit | e5be26fb233e0d29148846db21a70870ebe0d0bb (patch) | |
| tree | e63fb7337ead4a87fc975eff04fa843ca6ed5033 | |
| parent | c26fe63ee5d84492bcfb36664af8a90619e6ded5 (diff) | |
| download | pacman-e5be26fb233e0d29148846db21a70870ebe0d0bb.tar.gz pacman-e5be26fb233e0d29148846db21a70870ebe0d0bb.tar.xz | |
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>
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/pacman/Makefile.am | 6 |
2 files changed, 21 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 823d4691..d04cd5d1 100644 --- a/configure.ac +++ b/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: diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 4fe8b4fd..d0b727f6 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -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)\" \ |