projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes the new folder dialog in Diablo
[modest]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
410bac2
..
cf2f673
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-113,19
+113,19
@@
AC_SUBST(MODEST_GSTUFF_LIBS)
modest_save_cflags="$CFLAGS"
modest_save_libs="$LIBS"
modest_save_cflags="$CFLAGS"
modest_save_libs="$LIBS"
-CFLAGS="$MODEST_GSTUFF_CFLAGS"
-LIBS="$MODEST_GSTUFF_LIBS"
+PKG_CHECK_MODULES(MODEST_GTKHTML,libgtkhtml-${gtk_html_version})
+AC_SUBST(MODEST_GTKHTML_CFLAGS)
+AC_SUBST(MODEST_GTKHTML_LIBS)
+CFLAGS="$MODEST_GTKHTML_CFLAGS"
+LIBS="$MODEST_GTKHTML_LIBS"
AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[], [#include <gtk/gtk.h>])
AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[], [#include <gtk/gtk.h>])
-CFLAGS="$modest_save_cflags"
-LIBS="$modest_save_libs"
-
-__COPY_LIBS="$LIBS"
-LIBS="$LIBS $MODEST_GSTUFF_LIBS"
AC_CHECK_FUNCS(gtk_html_get_selection_area)
AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
AC_CHECK_FUNCS(gtk_html_get_selection_area)
AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
-LIBS="$__COPY_LIBS"
+CFLAGS="$modest_save_cflags"
+LIBS="$modest_save_libs"
+
dnl dnl now, determine what to build
dnl AC_MSG_NOTICE([Determining what platform to build])
dnl dnl now, determine what to build
dnl AC_MSG_NOTICE([Determining what platform to build])
@@
-619,10
+619,14
@@
if test "x$with_platform" == "xmaemo"; then
echo "libconic support : $have_libconic"
echo "Alarm : $have_libalarm"
echo "MCE : $have_mce"
echo "libconic support : $have_libconic"
echo "Alarm : $have_libalarm"
echo "MCE : $have_mce"
- echo "Hildon-Notify : $have_hildon_notify"
+ echo "Hildon-Notify : $have_hildon_notify"
echo "LibOGS support : $have_ogs_support"
echo "LibOGS support : $have_ogs_support"
- echo "MozEmbed support : $use_mozembed"
-fi
+fi
+
+echo "MozEmbed support : $use_mozembed"
+if [ $gtk_html_found = "true" ]; then
+ echo "GtkHTML version : $gtk_html_version"
+fi
echo "CFLAGS : $CFLAGS"
echo "Debug version : $with_debug"
echo "CFLAGS : $CFLAGS"
echo "Debug version : $with_debug"