[pkg-fso-commits] [SCM] libframeworkd-phonegui branch, upstream, updated. 640da47bfcff755388d0fb8f443eb34e0dea3c72

[Joachim Breitner]

The following commit has been merged in the upstream branch:
commit 640da47bfcff755388d0fb8f443eb34e0dea3c72
Merge: 70df8b0b19e1595f299f1d510bc8789abfb2a8dd e39c87629c835c8745b4bb8366e03c996ee4be18
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Dec 27 20:01:17 2008 +0100

    Merge commit 'shr/master' into upstream

diff --combined configure.ac
index bc439d9,bb198df..bb198df
--- a/configure.ac
+++ b/configure.ac
@@@ -10,7 -10,6 +10,6 @@@ AC_PROG_C
  AC_STDC_HEADERS
  AC_PROG_LIBTOOL
  
- PKG_CHECK_MODULES(PHONEGUI, libframeworkd-glib)
  PKG_CHECK_MODULES(GLIB, glib-2.0)
  AC_OUTPUT([
  Makefile
diff --combined src/Makefile.am
index e5c86ce,dfeb4f2..dfeb4f2
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -2,7 -2,7 +2,7 @@@ MAINTAINERCLEANFILES = Makefile.i
  
  localedir = $(datadir)/locale
  AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
- AM_CFLAGS = -Wall @PHONEGUI_CFLAGS@
+ AM_CFLAGS = -Wall @GLIB_CFLAGS@
  
  lib_LTLIBRARIES = libframeworkd-phonegui.la
  
@@@ -14,4 -14,4 +14,4 @@@ libframeworkd_phoneguidir = $(includedi
  
  libframeworkd_phonegui_la_LDFLAGS = $(all_libraries) -ldl
  
- libframeworkd_phonegui_la_LIBADD = @PHONEGUI_LIBS@ 
+ libframeworkd_phonegui_la_LIBADD = @GLIB_LIBS@ 

-- 
libframeworkd-phonegui