Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Fyfe <andrew@neptune-one.net>2007-05-31 18:44:00 -0400
committerDan McGee <dan@archlinux.org>2007-05-31 18:44:00 -0400
commit6d649473fa62726d783081025318f5add307b2d6 (patch)
tree96196fbe585c7367e53efc0fc47d8d4f0b165911
parentaf888c534b7c106ba89069ef6b11ea63d9f24975 (diff)
FS7319: Add option to disable the inclusion of abs script.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--configure.ac16
-rw-r--r--etc/Makefile.am6
-rw-r--r--scripts/Makefile.am5
3 files changed, 25 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 7ab8e3a0..86df9978 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,11 @@ AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug], [Enable debugging support]),
[debug=$enableval], [debug=no])
+# Help line for abs
+AC_ARG_ENABLE(abs,
+ AC_HELP_STRING([--disable-abs], [Include Arch Linux Build System script]),
+ [includeabs=$enableval], [includeabs=yes])
+
# Checks for programs.
AC_PROG_AWK
AC_PROG_CC
@@ -193,6 +198,16 @@ else
AC_MSG_RESULT(no)
fi
+# Enable or disable inclusion of abs script
+AC_MSG_CHECKING(for inclusion of abs script)
+if test "x$includeabs" = "xyes" ; then
+ AC_DEFINE([INCLUDE_ABS], , [Include abs script])
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(INCLUDE_ABS, test "x$includeabs" = "xyes")
+
# Set root directory
AC_SUBST(ROOTDIR)
AC_DEFINE_UNQUOTED([ROOTDIR], "$ROOTDIR", [Location of pacman's default root di
@@ -257,4 +272,5 @@ $PACKAGE_STRING:
Compilation options:
Doxygen support : ${usedoxygen}
debug support : ${debug}
+ include abs : ${includeabs}
"
diff --git a/etc/Makefile.am b/etc/Makefile.am
index b26a3e6c..733526c3 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = pacman.d abs
+SUBDIRS = pacman.d
+
+if INCLUDE_ABS
+SUBDIRS += abs
+endif
dist_sysconf_DATA = makepkg.conf pacman.conf
EXTRA_DIST = makepkg.conf.in pacman.conf.in
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1ebd785f..20aa209b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,7 +2,6 @@
AUTOMAKE_OPTIONS = std-options
bin_SCRIPTS = \
- abs \
gensync \
makepkg \
makeworld \
@@ -12,6 +11,10 @@ bin_SCRIPTS = \
repo-remove \
updatesync
+if INCLUDE_ABS
+bin_SCRIPTS += abs
+endif
+
EXTRA_DIST = \
abs.in \
gensync.in \