[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-234-ge6264f6

[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  e6264f671c8757a44f3aa4062253ae4256333d8c (commit)
      from  5f1cef62327a4d8e5e1406c9822e6381c8490bde (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=e6264f671c8757a44f3aa4062253ae4256333d8c


commit e6264f671c8757a44f3aa4062253ae4256333d8c
Author: Daniele Forsi <address@hidden>
Date:   Fri Jun 3 23:06:50 2011 +0200

    Add libical cflags and libs only to libgnokii makefile
    
    They are needlessly passed to all build commands if they are added
    to CFLAGS and to LIBS.

diff --git a/common/Makefile.am b/common/Makefile.am
index edc4c18..e8a04ee 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -19,7 +19,8 @@ pkgconfig_DATA = gnokii.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 libgnokii_la_CPPFLAGS = -DLIBDIR="\"$(libdir)\""
-libgnokii_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
+libgnokii_la_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) \
+       $(ICAL_CFLAGS)
 
 libgnokii_la_SOURCES = \
        libfunctions.c \
@@ -60,7 +61,8 @@ libgnokii_la_LIBADD = \
        $(INTLLIBS) \
        $(BLUETOOTH_LIBS) \
        $(USB_LIBS) \
-       $(TCP_LIBS)
+       $(TCP_LIBS) \
+       $(ICAL_LIBS)
 
 libgnokii_la_LDFLAGS =                                 \
        -version-info $(GNOKII_LT_VERSION)      \
diff --git a/configure.in b/configure.in
index a8f5139..fec08a6 100644
--- a/configure.in
+++ b/configure.in
@@ -390,8 +390,10 @@ AC_ARG_ENABLE(libical,
                      [enable_libical=yes])
 
 if test "$enable_libical" = "yes"; then
+       ICAL_LIBS="$ICAL_LIBS -lpthread -lical"
        OLD_CFLAGS="$CFLAGS"
-       LIBS="$LIBS $ICAL_LIBS -lpthread -lical"
+       OLD_LIBS="$LIBS"
+       LIBS="$LIBS $ICAL_LIBS"
        CFLAGS="$CFLAGS $ICAL_CFLAGS"
        AC_MSG_CHECKING(whether libical is installed)
        AC_TRY_LINK([
@@ -414,13 +416,16 @@ if test "$enable_libical" = "yes"; then
              AC_MSG_RESULT(yes)
              USE_LIBICAL="yes"
              AC_DEFINE([HAVE_LIBICAL],[1],[Use libical])
+             AC_SUBST(ICAL_LIBS)
+             AC_SUBST(ICAL_CFLAGS)
           ],
           [
              AC_MSG_RESULT(no)
-             LIBS="$OLD_LIBS"
-             CFLAGS="$OLD_CFLAGS"
+             ICAL_LIBS=""
           ]
        )
+       LIBS="$OLD_LIBS"
+       CFLAGS="$OLD_CFLAGS"
 fi
 
 dnl ======================== Check for libusb

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

Summary of changes:
 common/Makefile.am |    6 ++++--
 configure.in       |   11 ++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs