[anjuta] symbol-db: fixed bgo#604621 - specify /dev/shm at config time.

[Massimo Cora' <mcora src gnome org>]

commit 7eeed9187761b984da43702b628f0dd6ce8449a0
Author: Massimo Corà <mcora src gnome org>
Date:   Sun Dec 20 12:48:16 2009 +0100

    symbol-db: fixed bgo#604621 -  specify /dev/shm at config time.
    
    Improved compiling of benchmark and test-queries test programs. Now they link
    against libanjuta-symbol-db.la.

 configure.in                                 |   21 ++++++++++++++++++
 plugins/symbol-db/Makefile.am                |    3 +-
 plugins/symbol-db/benchmark/Makefile.am      |   29 ++-----------------------
 plugins/symbol-db/symbol-db-engine-priv.h    |    2 +-
 plugins/symbol-db/symbol-db-engine-queries.c |    2 +-
 plugins/symbol-db/test-queries/Makefile.am   |   28 +-----------------------
 6 files changed, 30 insertions(+), 55 deletions(-)
---
diff --git a/configure.in b/configure.in
index 6761feb..c53fde4 100644
--- a/configure.in
+++ b/configure.in
@@ -699,6 +699,27 @@ AC_SUBST(SVN_INCLUDE)
 AC_SUBST(SVN_LIB)
 AC_SUBST(SVN_CFLAGS)
 
+dnl ------------------------------------------
+dnl Symbol-db shared memory checks
+dnl ------------------------------------------
+
+SYMBOL_DB_SHM="/dev/shm"
+user_specified_shm=0
+AC_MSG_CHECKING(for symbol-db shared memory)
+AC_ARG_WITH(symbol-db-shm,
+		AC_HELP_STRING([--with-symbol-db-shm=DIR],[Where shared memory is placed ]),
+		[
+				user_specified_shm=1
+				SYMBOL_DB_SHM="$withval"
+		])
+if test "$user_specified_shm" = 1; then
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
+
+AC_SUBST(SYMBOL_DB_SHM)
+
 dnl --------- help outputs -----------
 dnl manuals/C/Makefile
 dnl manuals/C/anjuta-tutorial/Makefile
diff --git a/plugins/symbol-db/Makefile.am b/plugins/symbol-db/Makefile.am
index 0a69c98..b7eb17f 100644
--- a/plugins/symbol-db/Makefile.am
+++ b/plugins/symbol-db/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = images benchmark anjuta-tags test-queries
+SUBDIRS = . anjuta-tags images benchmark test-queries
 
 symbol_db_datadir = $(anjuta_data_dir)
 symbol_db_data_DATA = tables.sql
@@ -37,6 +37,7 @@ AM_CPPFLAGS = \
 	$(GDL_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	$(PLUGIN_SYMBOL_DB_CFLAGS) \
+	-DSYMBOL_DB_SHM=\"$(SYMBOL_DB_SHM)\" \
 	-DPACKAGE_BIN_DIR=\"$(bindir)\" \
 	-DG_LOG_DOMAIN=\"libanjuta-symbol-db\"
 
diff --git a/plugins/symbol-db/benchmark/Makefile.am b/plugins/symbol-db/benchmark/Makefile.am
index 1eb94e9..4022fd0 100644
--- a/plugins/symbol-db/benchmark/Makefile.am
+++ b/plugins/symbol-db/benchmark/Makefile.am
@@ -2,42 +2,19 @@ noinst_PROGRAMS = \
 	benchmark
 	
 
-AM_CPPFLAGS = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" \
-	-DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" \
-	-DANJUTA_IMAGE_DIR=\"$(anjuta_image_dir)\" \
-	-DANJUTA_GLADE_DIR=\"$(anjuta_glade_dir)\" \
-	-DANJUTA_UI_DIR=\"$(anjuta_ui_dir)\" \
-	-DPACKAGE_SRC_DIR=\"$(srcdir)\" \
-	$(LIBANJUTA_CFLAGS) \
+AM_CPPFLAGS =  $(LIBANJUTA_CFLAGS) \
 	$(PLUGIN_SYMBOL_DB_CFLAGS) \
-	$(GDL_CFLAGS) \
 	-DDEBUG
 
 benchmark_SOURCES = \
-	benchmark.c       \
-	../readtags.c       \
-	../readtags.h       \
-	../symbol-db-engine-core.c       \
-	../symbol-db-engine-queries.c       \
-	../symbol-db-engine-iterator.c       \
-	../symbol-db-engine-utils.c \
-	../symbol-db-engine-iterator-node.c \
-	../symbol-db-engine-iterator-node.h \
-	../symbol-db-view.h \
-	../symbol-db-view.c \
-	../symbol-db-engine-iterator.h \
-	../symbol-db-engine-queries.h \
-	../libgda-extra/gda-data-model-concat.c \
-	../libgda-extra/gda-data-model-concat.h \
-	../symbol-db-engine.h
+	benchmark.c
  
 
 benchmark_LDFLAGS = \
 	$(LIBANJUTA_LIBS) \
 	$(PLUGIN_SYMBOL_DB_LIBS)
 
+benchmark_LDADD = ../libanjuta-symbol-db.la
 
 ## File created by the gnome-build tools
 
diff --git a/plugins/symbol-db/symbol-db-engine-priv.h b/plugins/symbol-db/symbol-db-engine-priv.h
index 124fdc0..5ceaf31 100644
--- a/plugins/symbol-db/symbol-db-engine-priv.h
+++ b/plugins/symbol-db/symbol-db-engine-priv.h
@@ -47,7 +47,7 @@
 
 #define CTAGS_MARKER	"#_#\n"
 
-#define SHARED_MEMORY_PREFIX		"/dev/shm"
+#define SHARED_MEMORY_PREFIX			SYMBOL_DB_SHM
 
 #define THREADS_MAX_CONCURRENT			2
 #define TRIGGER_SIGNALS_DELAY			100
diff --git a/plugins/symbol-db/symbol-db-engine-queries.c b/plugins/symbol-db/symbol-db-engine-queries.c
index e1b3419..3ee58d8 100644
--- a/plugins/symbol-db/symbol-db-engine-queries.c
+++ b/plugins/symbol-db/symbol-db-engine-queries.c
@@ -2751,7 +2751,7 @@ symbol_db_engine_find_symbol_in_scope (SymbolDBEngine *dbe,
 	MP_SET_HOLDER_BATCH_INT(priv, param, container_symbol_id, ret_bool, ret_value);
 	
 	
-	DEBUG_PRINT ("query: %s", dyn_node->query_str);
+	/* DEBUG_PRINT ("query: %s", dyn_node->query_str); */
 
 	/* execute the query with parametes just set */
 	data = gda_connection_statement_execute_select (priv->db_connection, 
diff --git a/plugins/symbol-db/test-queries/Makefile.am b/plugins/symbol-db/test-queries/Makefile.am
index 42b1f93..65721a5 100644
--- a/plugins/symbol-db/test-queries/Makefile.am
+++ b/plugins/symbol-db/test-queries/Makefile.am
@@ -3,43 +3,19 @@ noinst_PROGRAMS = \
 	
 
 AM_CPPFLAGS = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DANJUTA_DATA_DIR=\"$(anjuta_data_dir)\" \
-	-DANJUTA_PLUGIN_DIR=\"$(anjuta_plugin_dir)\" \
-	-DANJUTA_IMAGE_DIR=\"$(anjuta_image_dir)\" \
-	-DANJUTA_GLADE_DIR=\"$(anjuta_glade_dir)\" \
-	-DANJUTA_UI_DIR=\"$(anjuta_ui_dir)\" \
-	-DPACKAGE_SRC_DIR=\"$(srcdir)\" \
-	$(LIBANJUTA_CFLAGS) \
 	$(PLUGIN_SYMBOL_DB_CFLAGS) \
 	$(GDL_CFLAGS) \
 	-DDEBUG
 
 test_queries_SOURCES = \
-	main.c       \
-	../readtags.c       \
-	../readtags.h       \
-	../symbol-db-engine-core.c       \
-	../symbol-db-engine-core.h       \
-	../symbol-db-engine-queries.c       \
-	../symbol-db-engine-queries.h \
-	../symbol-db-engine-iterator.c       \
-	../symbol-db-engine-iterator.h       \
-	../symbol-db-engine-utils.c \
-	../symbol-db-engine-utils.h \
-	../symbol-db-engine-iterator-node.c \
-	../symbol-db-engine-iterator-node.h \
-	../symbol-db-view.h \
-	../symbol-db-view.c \
-	../libgda-extra/gda-data-model-concat.c \
-	../libgda-extra/gda-data-model-concat.h \
-	../symbol-db-engine.h
+	main.c
  
 
 test_queries_LDFLAGS = \
 	$(LIBANJUTA_LIBS) \
 	$(PLUGIN_SYMBOL_DB_LIBS)
 
+test_queries_LDADD = ../libanjuta-symbol-db.la
 
 ## File created by the gnome-build tools