summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2009-04-02 06:25:22 +0200
committerAndreas Gruenbacher <agruen@suse.de>2009-04-02 06:25:22 +0200
commitb709d77ca8df8d7b18152745361b8ef6bd9d91b5 (patch)
treedceeccea328ff972db756d2f9c379c797ee64cdb /configure.ac
parent26642ab66b9af7797610694c554d19bfd9c56e3e (diff)
downloadpatch-b709d77ca8df8d7b18152745361b8ef6bd9d91b5.tar.gz
Add a simple form of merge support
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 81dcad2..e5d8431 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,5 +79,12 @@ PATCH_FUNC_MKDIR_TAKES_ONE_ARG
jm_AC_DOS
AC_SYS_LONG_FILE_NAMES
+AC_ARG_ENABLE([merge],
+ [AS_HELP_STRING([--disable-merge],
+ [disable support for merging])])
+if test "$enableval" != no ; then
+ AC_SUBST(ENABLE_MERGE, 1)
+fi
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT