From de2e1693ed6af8f49cc90abf3cb49a7c45a2bda2 Mon Sep 17 00:00:00 2001 From: halex Date: Fri, 29 Jun 2007 23:28:33 +0000 Subject: [PATCH] * Fixes --with-libcurl with bongo-collector and --with-sqlite3. Thanks to Albert Lee for these! * Accidentally missed some duplicate message definitions in dragonfly.properties. --- m4/sqlite3.m4 | 2 +- src/agents/collector/Bongo.rules | 2 +- src/www/l10n/dragonfly.properties | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/m4/sqlite3.m4 b/m4/sqlite3.m4 index 4f886ad..cd12461 100644 --- a/m4/sqlite3.m4 +++ b/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) diff --git a/src/agents/collector/Bongo.rules b/src/agents/collector/Bongo.rules index 03d573f..a8ffa1f 100644 --- a/src/agents/collector/Bongo.rules +++ b/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 \ diff --git a/src/www/l10n/dragonfly.properties b/src/www/l10n/dragonfly.properties index 5df683e..d841cbb 100644 --- a/src/www/l10n/dragonfly.properties +++ b/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