# 
# patch "ChangeLog"
#  from [032d75c0d833ad2afcc6b6198e81ceb5079dabcf]
#    to [bc018d0d92fa5f9dece3c472ebd584cba8097c04]
# 
# patch "Makefile.am"
#  from [a7e491111a9b40a5275427ec6fab1c85911bce2e]
#    to [dcd94c20746d932fd2928f7d0eaa2870e8d63a44]
# 
# patch "configure.ac"
#  from [d1e7f9b83ba767fe79589322bdf084a03c57d16d]
#    to [5439e5b38658dfbbd718e618437bb218cc25999a]
# 
===============================================
--- ChangeLog	032d75c0d833ad2afcc6b6198e81ceb5079dabcf
+++ ChangeLog	bc018d0d92fa5f9dece3c472ebd584cba8097c04
@@ -1,3 +1,10 @@
+2005-07-25  Matthew Gregan  <address@hidden>
+
+	* Makefile.am, configure.ac: Remove BUNDLED_{LUA,SQLITE} tests and
+	clarify the comment for popt.  Using external versions of these
+	tools didn't work anyway, so there's no point giving the
+	impression that it might.
+
 2005-07-24  Nathaniel Smith  <address@hidden>
 
 	* sanity.{hh,cc} (sanity::already_dumping, gasp): Don't let gasp
===============================================
--- Makefile.am	a7e491111a9b40a5275427ec6fab1c85911bce2e
+++ Makefile.am	dcd94c20746d932fd2928f7d0eaa2870e8d63a44
@@ -182,19 +182,15 @@
 unit_tests_LDFLAGS = 
 unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS
 
-# conditionals from configury
+lib3rdparty_a_SOURCES += $(LUA_SOURCES)
+monotone_CPPFLAGS += -I$(top_srcdir)/lua
+unit_tests_CPPFLAGS += -I$(top_srcdir)/lua
 
-if BUNDLED_LUA
-  lib3rdparty_a_SOURCES += $(LUA_SOURCES)
-  monotone_CPPFLAGS += -I$(top_srcdir)/lua
-  unit_tests_CPPFLAGS += -I$(top_srcdir)/lua
-endif
+lib3rdparty_a_SOURCES += $(SQLITE_SOURCES)
+monotone_CPPFLAGS += -I$(top_srcdir)/sqlite
+unit_tests_CPPFLAGS += -I$(top_srcdir)/sqlite
 
-if BUNDLED_SQLITE
-  lib3rdparty_a_SOURCES += $(SQLITE_SOURCES)
-  monotone_CPPFLAGS += -I$(top_srcdir)/sqlite
-  unit_tests_CPPFLAGS += -I$(top_srcdir)/sqlite
-endif
+# conditionals from configury
 
 if STATIC_BOOST
   BOOSTLIBS = @BOOST_LIBDIR@/libboost_filesystem$(BOOST_SUFFIX).a \
===============================================
--- configure.ac	d1e7f9b83ba767fe79589322bdf084a03c57d16d
+++ configure.ac	5439e5b38658dfbbd718e618437bb218cc25999a
@@ -285,51 +285,6 @@
 AC_SEARCH_LIBS([accept], [socket])
 AC_SEARCH_LIBS([inet_ntoa], [nsl])
 
-
-##########
-# Checks for external lua library, revert to bundled version if not found or
-# user gives --with-bundled-lua.
-AC_ARG_WITH([bundled-lua],
-   AS_HELP_STRING(
-      [--with-bundled-lua],
-      [Force use of bundled version of lua (default=yes)]
-   ), [bundled_lua="$withval"], [bundled_lua=yes]
-)
-
-if test "x$bundled_lua" = "xno" ; then
-   bundled_lua=yes
-   AC_CHECK_HEADERS([lua.h lualib.h],
-      AC_CHECK_LIB([lua], [lua_open],
-         AC_CHECK_LIB([lualib], [luaopen_base],
-            [LIBS="$LIBS -llua -llualib" ; bundled_lua=no], , [-llua]
-         )
-      )
-   )
-fi
-
-AM_CONDITIONAL(BUNDLED_LUA, test "x$bundled_lua" != "xno")
-
-##########
-# Checks for external sqlite library, revert to bundled version if not found or
-# user gives --with-bundled-sqlite.
-AC_ARG_WITH([bundled-sqlite],
-   AS_HELP_STRING(
-      [--with-bundled-sqlite],
-      [Force use of bundled version of sqlite (default=yes)]
-   ), [bundled_sqlite="$withval"], [bundled_sqlite=yes]
-)
-
-if test "x$bundled_sqlite" = "xno" ; then
-   bundled_sqlite=yes
-   AC_CHECK_HEADER([sqlite3.h],
-      AC_CHECK_LIB([sqlite3], [sqlite3_open],
-         [LIBS="$LIBS -lsqlite3" ; bundled_sqlite=no]
-      )
-   )
-fi
-
-AM_CONDITIONAL(BUNDLED_SQLITE, test "x$bundled_sqlite" != "xno")
-
 # Now let the user specify whether he wants large file support or not in
 # sqlite.
 AC_ARG_ENABLE([large-file],
@@ -349,9 +304,8 @@
 AC_SUBST(SQLITE_CPPFLAGS)
 
 ##########
-# Checks for bundled popt.  We use it unconditionally, because the external
-# one has serious bugs that we can't live with.  Maybe some time in the
-# future...
+# We use our bundled popt unconditionally, because the external one has
+# serious bugs that we can't live with.  Maybe some time in the future...
 # The following was simply taken from the configure.in that comes with popt.
 #AC_LANG_PUSH(C)
 AC_CHECK_HEADERS([alloca.h float.h libintl.h mcheck.h])