dnl version number
MAJOR_VERSION=2
-MINOR_VERSION=9
-MICRO_VERSION=1
+MINOR_VERSION=10
+MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=3
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
CFLAGS="$CFLAGS -mms-bitfields"
LIBS="$LIBS -l${pthread_name} -lws2_32 -lregex"
;;
+*-sun-solaris2.8)
+ CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+ CFLAGS="$CFLAGS -DSOLARIS"
+ ;;
esac
dnl Checks for iconv
dnl *****************
dnl check for glib
-AM_PATH_GLIB_2_0(2.6.0,,
- AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
- gmodule gobject gthread)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6 gmodule-2.0 >= 2.6 gobject-2.0 >= 2.6 gthread-2.0 >= 2.6)
+
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
syl_save_LIBS=$LIBS
dnl ************************
dnl Checks for GTK
-AM_PATH_GTK_2_0(2.6.0,,
- AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
dnl --disable-deprecated switch for GTK2 purification
AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ],
[ --enable-maemo Build for the Maemo platform [default=no]],
[ac_cv_enable_maemo=$enableval], [ac_cv_enable_maemo=no])
if test $ac_cv_enable_maemo = yes; then
- PKG_CHECK_MODULES(MAEMO, libosso hildon-libs, ac_cv_enable_maemo=yes,
+ PKG_CHECK_MODULES(MAEMO, libosso hildon-libs hildon-fm, ac_cv_enable_maemo=yes,
ac_cv_enable_maemo=no)
AC_SUBST(MAEMO_CFLAGS)
AC_SUBST(MAEMO_LIBS)
if test $ac_cv_enable_maemo = no; then
- AC_MSG_ERROR(libosso or hildon-libs not found)
+ AC_MSG_ERROR(libosso, hildon-libs or hildon-fm not found)
else
AC_DEFINE(MAEMO, 1, Build for maemo)
fi