2007-07-11 Frank Ch. Eigler <fche@elastic.org>

	* configure.ac: Don't AC_MSG_ERROR if don't HAVE_LIBSQLITE3.
	* coveragedb.cxx: Compile to nothing unless HAVE_LIBSQLITE3.
	* main.cxx: Print no error message on -q if HAVE_LIBSQLITE3.
	* configure: Regenerated, looks rosier with HAVE_LIBSQLITE3.

diff --git a/ChangeLog b/ChangeLog
index e72e9390203a43e0e750c441b0b8c6f9af39f689..50a6e564d4ed9b97e6cf9995b0e29f2273405199 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-11  Frank Ch. Eigler  <fche@elastic.org>
+
+       * configure.ac: Don't AC_MSG_ERROR if don't HAVE_LIBSQLITE3.
+       * coveragedb.cxx: Compile to nothing unless HAVE_LIBSQLITE3.
+       * main.cxx: Print no error message on -q if HAVE_LIBSQLITE3.
+       * configure: Regenerated, looks rosier with HAVE_LIBSQLITE3.
+
 2007-07-08  William Cohen  <wcohen@redhat.com>
 
        PR 4529

diff --git a/configure b/configure
index 9fd6b86cdf103323bab58c5a0caded47ba7f4dc7..99acf26a171db545870958ca29270e9ac71284b0 100755 (executable)
--- a/configure
+++ b/configure
@@ -5991,11 +5991,6 @@ _ACEOF
 
   LIBS="-lsqlite3 $LIBS"
 
-else
-
-    { { echo "$as_me:$LINENO: error: missing sqlite development headers/libraries" >&5
-echo "$as_me: error: missing sqlite development headers/libraries" >&2;}
-   { (exit 1); exit 1; }; }
 fi
 
 sqlite3_LIBS="$LIBS"

diff --git a/configure.ac b/configure.ac
index f0c5c9c7b294efb456d1e5d183fe87b4969393f6..90d93e017844f1889eaf0993dc8ed30e4b300914 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,8 +75,7 @@ fi])
 
 
 SAVE_LIBS="$LIBS"
-AC_CHECK_LIB(sqlite3, sqlite3_open,,[
-    AC_MSG_ERROR([missing sqlite development headers/libraries])])
+AC_CHECK_LIB(sqlite3, sqlite3_open)
 sqlite3_LIBS="$LIBS"
 AC_SUBST(sqlite3_LIBS)
 LIBS="$SAVE_LIBS"

diff --git a/coveragedb.cxx b/coveragedb.cxx
index 11d0abf2b8d774ce512a85904eaa4bd6e43747f4..bee84db97f995172bee13544273ffa2ad5fae572 100644 (file)
--- a/coveragedb.cxx
+++ b/coveragedb.cxx
@@ -14,6 +14,8 @@
 #include "session.h"
 #include "util.h"
 
+#ifdef HAVE_LIBSQLITE3
+
 #include <iostream>
 #include <sqlite3.h>
 #include <cstdlib>
@@ -363,3 +365,5 @@ void update_coverage_db(systemtap_session &s)
 
   sqlite3_close(db);
 }
+
+#endif /* HAVE_LIBSQLITE3 */

diff --git a/main.cxx b/main.cxx
index 53f475131911c6621eacddc238a80a9dcd54e0ee..d54713a694795ecad3d3b120d59376d6057f5f6d 100644 (file)
--- a/main.cxx
+++ b/main.cxx
@@ -100,7 +100,9 @@ usage (systemtap_session& s, int exitcode)
     << endl
     << "   -x PID     sets target() to PID" << endl
     << "   -t         collect probe timing information" << endl
+#ifdef HAVE_LIBSQLITE3
     << "   -q         generate information on tapset coverage"
+#endif /* HAVE_LIBSQLITE3 */
     << endl
     ;
   // -d: dump safety-related external references
@@ -802,7 +804,11 @@ pass_5:
 
   // update the database information
   if (!rc && s.tapset_compile_coverage) {
+#ifdef HAVE_LIBSQLITE3
     update_coverage_db(s);
+#else
+    cerr << "Coverage database not available without libsqlite3" << endl;
+#endif
   }
 
   // Clean up temporary directory.  Obviously, be careful with this.