diff options
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/pacman/.gitignore | 2 | ||||
| -rw-r--r-- | src/pacman/Makefile.am | 7 |
3 files changed, 0 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index ab5a3744..b4b6a566 100644 --- a/configure.ac +++ b/configure.ac @@ -119,11 +119,6 @@ AC_ARG_ENABLE(git-version, [enable use of git version in version string if available]), [wantgitver=$enableval], [wantgitver=no]) -# Help line for pacman.static -AC_ARG_ENABLE(pacman-static, - AS_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 @@ -324,16 +319,6 @@ else fi AM_CONDITIONAL(USE_GIT_VERSION, test "x$usegitver" = "xyes") -# Enable or disable inclusion of pacman.static -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 @@ -398,7 +383,6 @@ ${PACKAGE_NAME}: Doxygen support : ${usedoxygen} Asciidoc support : ${useasciidoc} debug support : ${debug} - build pacman.static : ${pacmanstatic} " # vim:set ts=2 sw=2 noet: diff --git a/src/pacman/.gitignore b/src/pacman/.gitignore index c47851ce..6a358aa3 100644 --- a/src/pacman/.gitignore +++ b/src/pacman/.gitignore @@ -2,5 +2,3 @@ .libs pacman pacman.exe -pacman.static -pacman.static.exe diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index e5f8cb36..220ee9cb 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -6,10 +6,6 @@ logfile = ${localstatedir}/log/pacman.log bin_PROGRAMS = pacman -if INCLUDE_PACMAN_STATIC -bin_PROGRAMS += pacman.static -endif - DEFS = -DLOCALEDIR=\"@localedir@\" \ -DCONFFILE=\"$(conffile)\" \ -DROOTDIR=\"$(ROOTDIR)\" \ @@ -40,7 +36,4 @@ pacman_SOURCES = \ LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la -pacman_static_SOURCES = $(pacman_SOURCES) -pacman_static_LDFLAGS = $(LDFLAGS) -all-static - # vim:set ts=2 sw=2 noet: |