some small fixes to manager makesystem

git-svn-id: file:///svnroot/mdictionary/trunk@261 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/src/manager/configure.ac b/src/manager/configure.ac
index 969054c..c344818 100644 (file)
--- a/src/manager/configure.ac
+++ b/src/manager/configure.ac
@@ -3,9 +3,9 @@ AM_INIT_AUTOMAKE(manager, 1.0)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0)
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.0)
-PKG_CHECK_MODULES(OSSO, libosso >= 0.21)
-PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 0.21)
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 0.21)
+PKG_CHECK_MODULES(OSSO, libosso >= 2.0)
+PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.0)
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.0)
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
@@ -22,7 +22,7 @@ AC_SUBST(GCONF_LIBS)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-SQLITEUSE = "0"
+SQLITEUSE=0
 AC_SUBST(SQLITEUSE)
 
 AC_PROG_CC

diff --git a/src/manager/src/Makefile.am b/src/manager/src/Makefile.am
index f7a950e..265b66b 100644 (file)
--- a/src/manager/src/Makefile.am
+++ b/src/manager/src/Makefile.am
@@ -1,4 +1,4 @@
 bin_PROGRAMS = mdictionaryManager
 mdictionaryManager_SOURCES =  untar.c  whitestork.c  ws_manager.c  ws_mng_bookmarks_utils.c  ws_mng_callbacks.c  ws_mng_dictionary_utils.c  ws_mng_gconf_utils.c  ws_mng_searching_threads.c  ws_mng_threads_utils.c
 mdictionaryManager_LDFLAGS = -L$(top_srcdir)/../../bin/lib $(GLIB_LIBS)  $(GMODULE_LIBS) $(OSSO_LIBS) $(GCONF_LIBS) $(GTHREAD_LIBS) -lbz2 -lws_dbus
-mdictionaryManager_CFLAGS = -DSQLITE=0 $(GLIB_CFLAGS)  $(GMODULE_CFLAGS) $(OSSO_CFLAGS) $(GCONF_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/../../include 
\ No newline at end of file
+mdictionaryManager_CFLAGS = -DSQLITE=$(SQLITEUSE) $(GLIB_CFLAGS)  $(GMODULE_CFLAGS) $(OSSO_CFLAGS) $(GCONF_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/../../include 
\ No newline at end of file