Author: artagnon
Date: Wed Dec 1 11:30:23 2010
New Revision: 1040959
URL: http://svn.apache.org/viewvc?rev=1040959&view=rev
Log:
Makefile.svn: Optionally allow building with threading support
* tools/dev/unix-build/Makefile.svn: Add new THREADING variable to
control whether APR and Sqlite should be built with threading
support.
Approved by: stsp
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1040959&r1=1040958&r2=1040959&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Dec 1 11:30:23 2010
@@ -233,6 +233,12 @@ $(APR_OBJDIR)/.retrieved:
fi
touch $@
+ifdef THREADING
+THREADS_FLAG=--enable-threads
+else
+THREADS_FLAG=--disable-threads
+endif
+
# configure apr
$(APR_OBJDIR)/.configured: $(APR_OBJDIR)/.retrieved
cp $(APR_SRCDIR)/build/apr_hints.m4 \
@@ -246,7 +252,7 @@ $(APR_OBJDIR)/.configured: $(APR_OBJDIR)
$(APR_SRCDIR)/configure \
--prefix=$(PREFIX)/apr \
--enable-maintainer-mode \
- --disable-threads
+ $(THREADS_FLAG)
touch $@
# compile apr
@@ -704,6 +710,12 @@ $(SQLITE_OBJDIR)/.retrieved: $(DISTDIR)/
tar -C $(SRCDIR) -zxf $(DISTDIR)/$(SQLITE_DIST)
touch $@
+ifdef THREADING
+THREADSAFE_FLAG=--enable-threadsafe
+else
+THREADSAFE_FLAG=--disable-threadsafe
+endif
+
# configure sqlite
$(SQLITE_OBJDIR)/.configured: $(SQLITE_OBJDIR)/.retrieved
cd $(SQLITE_OBJDIR) \
@@ -711,7 +723,7 @@ $(SQLITE_OBJDIR)/.configured: $(SQLITE_O
$(SQLITE_SRCDIR)/configure \
--prefix=$(PREFIX)/sqlite \
--disable-tcl \
- --disable-threadsafe
+ $(THREADSAFE_FLAG)
touch $@
# compile sqlite
