Changeset 1162

Timestamp:

02/28/07 13:05:17 (6 years ago)

Author:

thomas

Message:

• Clean up configure.ac and add a check for EContactPhotoType. Fixes bug 219.

Location:

trunk/src/target/OM-2007/applications/openmoko-dialer

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/contacts.c (modified) (2 diffs)

trunk/src/target/OM-2007/applications/openmoko-dialer/configure.ac

@@ -12 +12 @@
 
 # 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="$DIALER_LIBS  -lm -ldl"
 
-LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS $LIBASOUND_LIBS $LIBEBOOK_LIBS -lm -ldl"
-
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS $LIBASOUND_CFLAGS $LIBEBOOK_CFLAGS"
+CFLAGS="$DIALER_CFLAGS"
 
 # output stuff

trunk/src/target/OM-2007/applications/openmoko-dialer/src/Makefile.am

@@ -1 +1 @@
 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
@@ -25 +25 @@
 alsa.c
 
-openmoko_dialer_LDADD = @OPENMOKO_LIBS@
+openmoko_dialer_LDADD = @LIBS@
 

trunk/src/target/OM-2007/applications/openmoko-dialer/src/contacts.c

@@ -16 +16 @@
  *  Current Version: $Rev$ ($Date) [$Author: Tony Guan $]
  */
-#define LIBEBOOK1_2_5 1
 #include "contacts.h"
+#include "config.h"
 
 /**
@@ -645 +645 @@
   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
         }