[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-8-g8eb4566

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  8eb456627668dcf70a24cb36ccc96d78d6d6afe4 (commit)
       via  d97255b08a471737c15b3bf9b5bd74ec0a96a62f (commit)
      from  e05eb569c32703bb95f1e587cb1677a18253d669 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=8eb456627668dcf70a24cb36ccc96d78d6d6afe4


commit 8eb456627668dcf70a24cb36ccc96d78d6d6afe4
Author: Daniele Forsi <address@hidden>
Date:   Fri May 7 11:26:21 2010 +0200

    Make configure fail if glib can't be used.
    
    Now libglib2.0-dev (or similar) is a prerequisite also for libgnokii.
    If gmodule isn't available do not build smsd.

diff --git a/configure.in b/configure.in
index deb7846..b80abce 100644
--- a/configure.in
+++ b/configure.in
@@ -712,8 +712,11 @@ AM_CONDITIONAL(HAVE_GTK, test "x$found_gtk" = "xyes")
 dnl ======================== Check for libsocket
 AC_CHECK_LIB(socket, socket)
 
-dnl ======================== Checks for glib support for smsd
-PKG_CHECK_MODULES(GLIB, glib-2.0 gmodule-2.0, found_glib=yes, found_glib=no)
+dnl ======================== Checks for glib support for libgnokii and smsd
+PKG_CHECK_MODULES(GLIB, glib-2.0)
+
+dnl ======================== Checks for gmodule support for smsd
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0, found_gmodule=yes, found_gmodule=no)
 
 dnl ======================== Autodetect for possibilities to compile smsd
 AC_ARG_ENABLE(smsd,
@@ -722,8 +725,8 @@ AC_ARG_ENABLE(smsd,
        [enable_smsd=yes])
 
 if test "$enable_smsd" = yes; then
-       if test "$found_glib" = no; then
-               AC_MSG_WARN(Cannot find glib 2.0.)
+       if test "$found_gmodule" = no; then
+               AC_MSG_WARN(Cannot find gmodule 2.0.)
                AC_MSG_WARN(Disabling smsd.)
                enable_smsd="no"
        fi
diff --git a/smsd/Makefile.am b/smsd/Makefile.am
index d2e4045..3643f62 100644
--- a/smsd/Makefile.am
+++ b/smsd/Makefile.am
@@ -24,7 +24,7 @@ libsmsd_file_la_LDFLAGS = $(modules_flags)
 libsmsd_file_la_LIBADD = $(GLIB_LIBS)
 
 smsd_SOURCES = smsd.h smsd.c lowlevel.c lowlevel.h db.h
-smsd_LDADD = $(GLIB_LIBS) $(PTHREAD_LIBS) $(INTLLIBS) 
$(top_builddir)/common/libgnokii.la
+smsd_LDADD = $(GLIB_LIBS) $(GMODULE_LIBS) $(PTHREAD_LIBS) $(INTLLIBS) 
$(top_builddir)/common/libgnokii.la
 
 AM_CFLAGS =                            \
        -I$(top_srcdir)/include         \

http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=d97255b08a471737c15b3bf9b5bd74ec0a96a62f


commit 8eb456627668dcf70a24cb36ccc96d78d6d6afe4
Author: Daniele Forsi <address@hidden>
Date:   Fri May 7 11:26:21 2010 +0200

    Make configure fail if glib can't be used.
    
    Now libglib2.0-dev (or similar) is a prerequisite also for libgnokii.
    If gmodule isn't available do not build smsd.

diff --git a/configure.in b/configure.in
index deb7846..b80abce 100644
--- a/configure.in
+++ b/configure.in
@@ -712,8 +712,11 @@ AM_CONDITIONAL(HAVE_GTK, test "x$found_gtk" = "xyes")
 dnl ======================== Check for libsocket
 AC_CHECK_LIB(socket, socket)
 
-dnl ======================== Checks for glib support for smsd
-PKG_CHECK_MODULES(GLIB, glib-2.0 gmodule-2.0, found_glib=yes, found_glib=no)
+dnl ======================== Checks for glib support for libgnokii and smsd
+PKG_CHECK_MODULES(GLIB, glib-2.0)
+
+dnl ======================== Checks for gmodule support for smsd
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0, found_gmodule=yes, found_gmodule=no)
 
 dnl ======================== Autodetect for possibilities to compile smsd
 AC_ARG_ENABLE(smsd,
@@ -722,8 +725,8 @@ AC_ARG_ENABLE(smsd,
        [enable_smsd=yes])
 
 if test "$enable_smsd" = yes; then
-       if test "$found_glib" = no; then
-               AC_MSG_WARN(Cannot find glib 2.0.)
+       if test "$found_gmodule" = no; then
+               AC_MSG_WARN(Cannot find gmodule 2.0.)
                AC_MSG_WARN(Disabling smsd.)
                enable_smsd="no"
        fi
diff --git a/smsd/Makefile.am b/smsd/Makefile.am
index d2e4045..3643f62 100644
--- a/smsd/Makefile.am
+++ b/smsd/Makefile.am
@@ -24,7 +24,7 @@ libsmsd_file_la_LDFLAGS = $(modules_flags)
 libsmsd_file_la_LIBADD = $(GLIB_LIBS)
 
 smsd_SOURCES = smsd.h smsd.c lowlevel.c lowlevel.h db.h
-smsd_LDADD = $(GLIB_LIBS) $(PTHREAD_LIBS) $(INTLLIBS) 
$(top_builddir)/common/libgnokii.la
+smsd_LDADD = $(GLIB_LIBS) $(GMODULE_LIBS) $(PTHREAD_LIBS) $(INTLLIBS) 
$(top_builddir)/common/libgnokii.la
 
 AM_CFLAGS =                            \
        -I$(top_srcdir)/include         \

-----------------------------------------------------------------------

Summary of changes:
 common/vcard.c   |    9 ++++++---
 configure.in     |   11 +++++++----
 smsd/Makefile.am |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs