From ef86c8fe24ff7303cdc8c5bd423bc74e3dcebdbd Mon Sep 17 00:00:00 2001
From: Michael Cahill <michael.cahill@wiredtiger.com>
Date: Thu, 24 Apr 2014 08:37:09 +1000
Subject: [PATCH] Remove Java and Python build rules that relied on
 "--enable-debug".  Always require junit to test the Java build, and don't
 turn on the "-g" flag in the Python build: we're not debugging the glue code
 in general.

---
 build_posix/configure.ac.in | 6 +-----
 lang/python/Makefile.am     | 7 ++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/build_posix/configure.ac.in b/build_posix/configure.ac.in
index 3e88a4ad34a..1592a486ed3 100644
--- a/build_posix/configure.ac.in
+++ b/build_posix/configure.ac.in
@@ -33,8 +33,6 @@ else
 	fi
 fi
 
-AM_CONDITIONAL([DEBUG], [test "$wt_cv_enable_debug" = "yes"])
-
 # Java and Python APIs
 if test "$wt_cv_enable_java" = "yes" -o "$wt_cv_enable_python" = "yes"; then
 	AX_PKG_SWIG(2.0.4, [],
@@ -46,9 +44,7 @@ if test "$wt_cv_enable_java" = "yes"; then
 	AX_PROG_JAVAC
 	AX_PROG_JAR
 	AX_JNI_INCLUDE_DIR
-	if test "$wt_cv_enable_debug" = "yes"; then
-		AX_CHECK_JUNIT
-	fi
+	AX_CHECK_JUNIT
 	for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS ; do
 		JNI_CPPFLAGS="$JNI_CPPFLAGS -I$JNI_INCLUDE_DIR"
 	done
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index cc7d9507b2e..0ac56138e29 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -1,8 +1,5 @@
 PYSRC = $(top_srcdir)/lang/python
 PY_INCLUDE_DIRS = $(top_srcdir)
-if DEBUG
-PY_SETUP_DEBUG = -g
-endif
 all-local: _wiredtiger.so
 
 # We keep generated Python sources under lang/python: that's where they live
@@ -13,11 +10,11 @@ $(PYSRC)/wiredtiger_wrap.c: $(top_srcdir)/src/include/wiredtiger.in $(PYSRC)/wir
 	    mv wiredtiger.py wiredtiger/__init__.py)
 
 _wiredtiger.so: $(top_builddir)/libwiredtiger.la $(PYSRC)/wiredtiger_wrap.c
-	$(PYTHON) $(PYSRC)/setup.py build_ext -b . -t . -f $(PY_SETUP_DEBUG) -I $(PY_INCLUDE_DIRS)
+	$(PYTHON) $(PYSRC)/setup.py build_ext -b . -t . -f -I $(PY_INCLUDE_DIRS)
 
 install-exec-local:
 	$(PYTHON) $(PYSRC)/setup.py build_py -d build
-	$(PYTHON) $(PYSRC)/setup.py build_ext -b build -t . -f $(PY_SETUP_DEBUG) -I $(PY_INCLUDE_DIRS)
+	$(PYTHON) $(PYSRC)/setup.py build_ext -b build -t . -f -I $(PY_INCLUDE_DIRS)
 	$(PYTHON) $(PYSRC)/setup.py install_lib -b build --skip-build $(PYTHON_INSTALL_ARG)
 
 clean-local: