From f725863f75fda1beed47eaef5cb2c4b5289e4dd1 Mon Sep 17 00:00:00 2001 From: Derrell Lipman Date: Sat, 4 Jun 2005 21:20:56 +0000 Subject: r7283: add sqlite3.m4 (This used to be commit 10a828a442b516551762bff81782072d9807d626) --- source4/lib/ldb/sqlite3.m4 | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 source4/lib/ldb/sqlite3.m4 (limited to 'source4/lib/ldb/sqlite3.m4') diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 new file mode 100644 index 0000000000..8bbe186160 --- /dev/null +++ b/source4/lib/ldb/sqlite3.m4 @@ -0,0 +1,49 @@ +######################################################## +# Compile with SQLITE3 support? + +SQLITE3_LIBS="" +with_sqlite3_support=auto +AC_MSG_CHECKING([for SQLITE3 support]) + +AC_ARG_WITH(sqlite3, +[ --with-sqlite3 SQLITE3 support (default yes)], +[ case "$withval" in + yes|no) + with_sqlite3_support=$withval + ;; + esac ]) + +AC_MSG_RESULT($with_sqlite3_support) + +if test x"$with_sqlite3_support" != x"no"; then + + ################################################################## + # first test for sqlite3.h + AC_CHECK_HEADERS(sqlite3.h) + + if test x"$ac_cv_header_sqlite3_h" != x"yes"; then + if test x"$with_sqlite3_support" = x"yes"; then + AC_MSG_ERROR(sqlite3.h is needed for SQLITE3 support) + else + AC_MSG_WARN(sqlite3.h is needed for SQLITE3 support) + fi + + with_sqlite3_support=no + fi +fi + +if test x"$with_sqlite3_support" != x"no"; then + ac_save_LIBS=$LIBS + + ######################################################## + # now see if we can find the sqlite3 libs in standard paths + AC_CHECK_LIB_EXT(sqlite3, SQLITE3_LIBS, sqlite3_open) + + LIBS="$LIBS $SQLITE3_LIBS" + + AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available]) + AC_MSG_CHECKING(whether SQLITE3 support is used) + AC_MSG_RESULT(yes) +fi + +SMB_EXT_LIB(SQLITE3,[${SQLITE3_LIBS}],[${SQLITE3_CFLAGS}],[${SQLITE3_CPPFLAGS}],[${SQLITE3_LDFLAGS}]) -- cgit From c88d65a862cefe832f3b5f38844829372a926e33 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 5 Jun 2005 04:18:57 +0000 Subject: r7292: Fix up the build system support for derrell's sqlite3 ldb backend. It is on by default, so I've also fixed a build issue in it. I'll show how to make it off be default in the next commit. Andrew Bartlett (This used to be commit 5a1ef888100e8ef803100a6341133d96e8a400b0) --- source4/lib/ldb/sqlite3.m4 | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'source4/lib/ldb/sqlite3.m4') diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 index 8bbe186160..fe0f398624 100644 --- a/source4/lib/ldb/sqlite3.m4 +++ b/source4/lib/ldb/sqlite3.m4 @@ -39,11 +39,24 @@ if test x"$with_sqlite3_support" != x"no"; then # now see if we can find the sqlite3 libs in standard paths AC_CHECK_LIB_EXT(sqlite3, SQLITE3_LIBS, sqlite3_open) - LIBS="$LIBS $SQLITE3_LIBS" - - AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available]) - AC_MSG_CHECKING(whether SQLITE3 support is used) - AC_MSG_RESULT(yes) + if test x"$ac_cv_lib_ext_sqlite3_sqlite3_open" = x"yes"; then + AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available]) + AC_MSG_CHECKING(whether SQLITE3 support is used) + AC_MSG_RESULT(yes) + with_sqlite3_support=yes + SMB_EXT_LIB_ENABLE(SQLITE3,YES) + else + if test x"$with_sqlite3_support" = x"yes"; then + AC_MSG_ERROR(libsqlite3 is needed for SQLITE3 support) + else + AC_MSG_WARN(libsqlite3 is needed for SQLITE3 support) + fi + + SQLITE3_LIBS="" + with_sqlite3_support=no + fi + + LIBS=$ac_save_LIBS; fi SMB_EXT_LIB(SQLITE3,[${SQLITE3_LIBS}],[${SQLITE3_CFLAGS}],[${SQLITE3_CPPFLAGS}],[${SQLITE3_LDFLAGS}]) -- cgit From 03840652354598db203a3596077ecc55726880c8 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 5 Jun 2005 04:27:12 +0000 Subject: r7293: Turn sqlite3 support off by default, use --with-sqlite3 to re-enable. Andrew Bartlett (This used to be commit 422579215462c31dd863ab1b7f187003dafd0af2) --- source4/lib/ldb/sqlite3.m4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source4/lib/ldb/sqlite3.m4') diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 index fe0f398624..ab7c61f243 100644 --- a/source4/lib/ldb/sqlite3.m4 +++ b/source4/lib/ldb/sqlite3.m4 @@ -6,7 +6,7 @@ with_sqlite3_support=auto AC_MSG_CHECKING([for SQLITE3 support]) AC_ARG_WITH(sqlite3, -[ --with-sqlite3 SQLITE3 support (default yes)], +[ --with-sqlite3 SQLITE3 support (default no)], [ case "$withval" in yes|no) with_sqlite3_support=$withval @@ -15,8 +15,9 @@ AC_ARG_WITH(sqlite3, AC_MSG_RESULT($with_sqlite3_support) -if test x"$with_sqlite3_support" != x"no"; then - +if test x"$with_sqlite3_support" != x"yes"; then + with_sqlite3_support=no +else ################################################################## # first test for sqlite3.h AC_CHECK_HEADERS(sqlite3.h) -- cgit From 5141a1e50ca86ffaedc02d19768f613b64923968 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 6 Jun 2005 13:36:02 +0000 Subject: r7336: make --with-sqlite3=auto possible metze (This used to be commit cd59ff50ed00526c2af5ebddfb1fca942ba8faa6) --- source4/lib/ldb/sqlite3.m4 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'source4/lib/ldb/sqlite3.m4') diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 index ab7c61f243..d4a4c95870 100644 --- a/source4/lib/ldb/sqlite3.m4 +++ b/source4/lib/ldb/sqlite3.m4 @@ -2,22 +2,20 @@ # Compile with SQLITE3 support? SQLITE3_LIBS="" -with_sqlite3_support=auto +with_sqlite3_support=no AC_MSG_CHECKING([for SQLITE3 support]) AC_ARG_WITH(sqlite3, -[ --with-sqlite3 SQLITE3 support (default no)], +[ --with-sqlite3 SQLITE3 support (default=no)], [ case "$withval" in - yes|no) + yes|no|auto) with_sqlite3_support=$withval ;; esac ]) AC_MSG_RESULT($with_sqlite3_support) -if test x"$with_sqlite3_support" != x"yes"; then - with_sqlite3_support=no -else +if test x"$with_sqlite3_support" != x"no"; then ################################################################## # first test for sqlite3.h AC_CHECK_HEADERS(sqlite3.h) -- cgit From d346794a8d962de209cc3a111c73e23553c9a767 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 26 Jan 2006 16:37:37 +0000 Subject: r13166: Patches form Brad Hards (This used to be commit 335050b30d832f529fb8fdd4f96e4bb3de93f38c) --- source4/lib/ldb/sqlite3.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/ldb/sqlite3.m4') diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 index d4a4c95870..352085da74 100644 --- a/source4/lib/ldb/sqlite3.m4 +++ b/source4/lib/ldb/sqlite3.m4 @@ -6,7 +6,7 @@ with_sqlite3_support=no AC_MSG_CHECKING([for SQLITE3 support]) AC_ARG_WITH(sqlite3, -[ --with-sqlite3 SQLITE3 support (default=no)], +AS_HELP_STRING([--with-sqlite3],[SQLITE3 backend support (default=no)]), [ case "$withval" in yes|no|auto) with_sqlite3_support=$withval -- cgit From 0d5587b5d128d9dd502a3b78c02fb986b33d92c4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 26 Apr 2006 12:22:54 +0000 Subject: r15274: Drop default EXT_LIB_ prefix for external libraries. Fixes issues with local (empty) libpopt.a overriding global one (This used to be commit 2f06305e53478e5030c24550954f221a9a97c83f) --- source4/lib/ldb/sqlite3.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/ldb/sqlite3.m4') diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 index 352085da74..49e3807730 100644 --- a/source4/lib/ldb/sqlite3.m4 +++ b/source4/lib/ldb/sqlite3.m4 @@ -43,7 +43,7 @@ if test x"$with_sqlite3_support" != x"no"; then AC_MSG_CHECKING(whether SQLITE3 support is used) AC_MSG_RESULT(yes) with_sqlite3_support=yes - SMB_EXT_LIB_ENABLE(SQLITE3,YES) + SMB_ENABLE(SQLITE3,YES) else if test x"$with_sqlite3_support" = x"yes"; then AC_MSG_ERROR(libsqlite3 is needed for SQLITE3 support) -- cgit From 95340f8afb12b8c9bcaaa230b4cad74e77a79a9c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 25 Sep 2006 16:59:00 +0000 Subject: r18903: merge from samba3: define HAVE_LDB_LDAP and HAVE_LDB_SQLITE3 metze (This used to be commit 4e2f5ba490d717283ab089d90ebd5c108a8c53b0) --- source4/lib/ldb/sqlite3.m4 | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/lib/ldb/sqlite3.m4') diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 index 49e3807730..d0a74ee53c 100644 --- a/source4/lib/ldb/sqlite3.m4 +++ b/source4/lib/ldb/sqlite3.m4 @@ -40,6 +40,7 @@ if test x"$with_sqlite3_support" != x"no"; then if test x"$ac_cv_lib_ext_sqlite3_sqlite3_open" = x"yes"; then AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available]) + AC_DEFINE(HAVE_LDB_SQLITE3,1,[Whether ldb_sqlite3 is available]) AC_MSG_CHECKING(whether SQLITE3 support is used) AC_MSG_RESULT(yes) with_sqlite3_support=yes -- cgit