[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-298-gaae8242

[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  aae8242ed8eb1644aefd97fd05446784d85683d9 (commit)
      from  fbc039ed11936333b1adc7ee3cd039fb8128b2c9 (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=aae8242ed8eb1644aefd97fd05446784d85683d9


commit aae8242ed8eb1644aefd97fd05446784d85683d9
Author: Daniele Forsi <address@hidden>
Date:   Sat Jul 23 15:05:48 2011 +0200

    Do not try to complie xgnokii after ./configure --without-x
    
    This was broken by commit cac99fbb22e259143023bd699d9ff958eace3f6f
    but the condition in the makefile was wrong because xgnokii depends
    on gtk+2 and pthread, not just on gtk+2.

diff --git a/Makefile.am b/Makefile.am
index ba1239f..49ea2ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ else
 SUBDIRS += gnokiid utils
 endif
 
-if HAVE_GTK
+if XGNOKII
 SUBDIRS += xgnokii
 endif
 
diff --git a/configure.in b/configure.in
index 741baca..7f6e8f1 100644
--- a/configure.in
+++ b/configure.in
@@ -689,7 +689,7 @@ else
    fi
 fi
 
-AM_CONDITIONAL(HAVE_GTK, test "x$found_gtk" = "xyes")
+AM_CONDITIONAL(XGNOKII, test "x$_support" = "xyes")
 
 dnl ======================== Check for libsocket
 AC_CHECK_LIB(socket, socket)

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

Summary of changes:
 Makefile.am  |    2 +-
 configure.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs