* Fixes --with-libcurl with bongo-collector and --with-sqlite3.

Thanks to Albert Lee <trisk@acm.jhu.edu> for these!
* Accidentally missed some duplicate message definitions in dragonfly.properties.

m4/sqlite3.m4

@@ -74,7 +74,7 @@ AC_DEFUN([AC_CHECK_SQLITE3], [
       else
           test "x$SQLITE_LIBS" = "x" && SQLITE_LIBS="-L$ac_sqlite3_libdir -lsqlite3"
       fi
-      test x"$ac_sqlite3_incdir" = xno && test "x$SQLITE_CFLAGS" = "x" && SQLITE_INCLUDE=-I$ac_sqlite3_incdir
+      test x"$ac_sqlite3_incdir" != xno && test "x$SQLITE_CFLAGS" = "x" && SQLITE_CFLAGS=-I$ac_sqlite3_incdir
 
       AC_SUBST(SQLITE_LIBS)
       AC_SUBST(SQLITE_CFLAGS)

src/agents/collector/Bongo.rules

@@ -6,7 +6,7 @@ bongocollector_SOURCES :=			\
 	src/agents/collector/collector.h
 
 bongocollector_CPPFLAGS := $(AM_CPPFLAGS) \
-	-I$(top_srcdir)/import/curl/include
+	$(LIBCURL_CPPFLAGS)
 
 bongocollector_LDADD :=						   \
 	libbongonmap.la						   \

src/www/l10n/dragonfly.properties

@@ -1,9 +1,3 @@
-loginNameLabel=Name:
-loginPasswordLabel=Password:
-loginLanguageLabel=Language:
-loginRememberMeLabel=Remember Me
-loginLoginLabel=Log In
-
 genericError=An error has occured:
 genericErrorOK=Bummer