r1162 - in trunk/src/target/OM-2007/applications/openmoko-dialer: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-02-28 13:05:17 +0100 (Wed, 28 Feb 2007)
New Revision: 1162

Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
Log:
* Clean up configure.ac and add a check for EContactPhotoType. Fixes bug 219.


Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac	2007-02-28 11:55:34 UTC (rev 1161)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac	2007-02-28 12:05:17 UTC (rev 1162)
@@ -11,22 +11,21 @@
 AC_PROG_LIBTOOL
 
 # base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
-                 AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
-                 
-PKG_CHECK_MODULES(LIBGSMD, libgsmd ,,
-                 AC_MSG_ERROR([*** Required libgsmd not installed ***]))
+PKG_CHECK_MODULES(DIALER, openmoko-libs >= 0.0.1 libgsmd alsa libebook-1.2)
 
-PKG_CHECK_MODULES(LIBASOUND, alsa,,
-                 AC_MSG_ERROR([*** Required libasound not installed ***]))
+old_cflags=$CFLAGS
+CFLAGS=$DIALER_CFLAGS
+AC_CHECK_TYPE(EContactPhotoType, [], [], [#include <libebook/e-book.h>])
+CFLAGS=$old_cflags
 
+if test $ac_cv_type_EContactPhotoType = yes; then
+	AC_DEFINE(HAVE_ECONTACT_PHOTO_TYPE, 1, [Defined if EContactPhotoType exists])
+fi
 
-PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2,,
-                 AC_MSG_ERROR([*** Required libasound not installed ***]))
 
-LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS $LIBASOUND_LIBS $LIBEBOOK_LIBS -lm -ldl"
+LIBS="$DIALER_LIBS  -lm -ldl"
 
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS $LIBASOUND_CFLAGS $LIBEBOOK_CFLAGS"
+CFLAGS="$DIALER_CFLAGS"
 
 # output stuff
 AC_OUTPUT([

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am	2007-02-28 11:55:34 UTC (rev 1161)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am	2007-02-28 12:05:17 UTC (rev 1162)
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
               -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall -pedantic -std=c99 @OPENMOKO_CFLAGS@
+AM_CFLAGS = -Wall -pedantic -std=c99 @CFLAGS@
 
 bin_PROGRAMS = openmoko-dialer
 
@@ -24,5 +24,5 @@
 moko-dialer-status.c\
 alsa.c
 
-openmoko_dialer_LDADD = @OPENMOKO_LIBS@
+openmoko_dialer_LDADD = @LIBS@
 

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c	2007-02-28 11:55:34 UTC (rev 1161)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c	2007-02-28 12:05:17 UTC (rev 1162)
@@ -15,8 +15,8 @@
  *
  *  Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
  */
-#define LIBEBOOK1_2_5 1
 #include "contacts.h"
+#include "config.h"
 
 /**
  * @brief initialze the contact list, this will be called from outside, contactlist
@@ -644,11 +644,11 @@
 if(photo)
   if (photo)
   	{
-#ifndef LIBEBOOK1_2_5  	
+#ifdef HAVE_ECONTACT_PHOTO_TYPE
    gdk_pixbuf_loader_write (loader, photo->data.inlined.data,
                             photo->data.inlined.length, NULL);
 #else
-    gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL); //just temporaly modified.                           
+    gdk_pixbuf_loader_write (loader, photo->data, photo->length, NULL);
 #endif
   	}