From e5be26fb233e0d29148846db21a70870ebe0d0bb Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 1 Nov 2007 19:36:50 -0500
Subject: [PATCH] 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>
---
 configure.ac           | 16 ++++++++++++++++
 src/pacman/Makefile.am |  6 +++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

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)\" \