Bug 31174 - Update autotools configuration

[framework/uifw/harfbuzz.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 754fd47..3c0d7af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,27 @@
-AC_PREREQ(2.59)
-AC_INIT(harfbuzz, 0.1, [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz])
+AC_PREREQ([2.64])
+AC_INIT([harfbuzz],
+        [0.3],
+        [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
+        [harfbuzz],
+        [http://freedesktop.org/wiki/Software/harfbuzz])
+
 AC_CONFIG_SRCDIR([harfbuzz.pc.in])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.9.6 gnu dist-bzip2 no-dist-gzip -Wall no-define])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.11.1 gnu dist-bzip2 no-dist-gzip -Wall no-define])
 
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
+AM_SILENT_RULES([yes])
 
+# Check for programs
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CXX
 
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([win32-dll])
+
 AC_CHECK_FUNCS(mprotect sysconf getpagesize)
 AC_CHECK_HEADERS(unistd.h sys/mman.h)
 
@@ -27,7 +38,15 @@ if $have_glib; then
 fi
 AM_CONDITIONAL(HAVE_GLIB, $have_glib)
 
-PKG_CHECK_MODULES(ICU, icu, have_icu=true, have_icu=false)
+PKG_CHECK_MODULES(ICU, icu, have_icu=true, [
+       AC_CHECK_PROG([have_icu], [icu-config], [true], [false])
+       if $have_icu; then
+               icu_cflags=`icu-config --cppflags`
+               icu_libs=`icu-config --ldflags-libsonly`
+               AC_SUBST(ICU_CFLAGS, [$icu_cflags])
+               AC_SUBST(ICU_LIBS, [$icu_libs])
+       fi
+])
 if $have_icu; then
        AC_DEFINE(HAVE_ICU, 1, [Have ICU library])
 fi
@@ -36,6 +55,13 @@ AM_CONDITIONAL(HAVE_ICU, $have_icu)
 PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=true, have_freetype=false)
 if $have_freetype; then
        AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library])
+       _save_libs="$LIBS"
+       _save_cflags="$CFLAGS"
+       LIBS="$LIBS $FREETYPE_LIBS"
+       CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
+       AC_CHECK_FUNCS(FT_Face_GetCharVariantIndex)
+       LIBS="$_save_libs"
+       CFLAGS="$_save_cflags"
 fi
 AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)