Add AC_CANONICAL_HOST

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

diff --git a/configure.ac b/configure.ac
index e74dd67..c0ff166 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,44 +1,91 @@
-AC_PREREQ(2.59)
-AC_INIT(harfbuzz, 0.2, [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_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
+AM_INIT_AUTOMAKE([1.11.1 gnu dist-bzip2 no-dist-gzip -Wall no-define])
+
+AM_SILENT_RULES([yes])
+
+AC_CANONICAL_HOST
 
+# Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([win32-dll])
+
+# Functions and headers
 AC_CHECK_FUNCS(mprotect sysconf getpagesize)
 AC_CHECK_HEADERS(unistd.h sys/mman.h)
 
-# Make sure we don't link to libstdc++
+# Compiler flags
 if test "x$GCC" = "xyes"; then
+
+       # Make sure we don't link to libstdc++
        CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+       case "$host" in
+               arm-*-*)
+                       # Request byte alignment on arm
+                       CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
+               ;;
+       esac
 fi
 
 dnl ==========================================================================
 
-PKG_CHECK_MODULES(GLIB, glib-2.0, have_glib=true, have_glib=false)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, have_glib=true, have_glib=false)
 if $have_glib; then
        AC_DEFINE(HAVE_GLIB, 1, [Have glib2 library])
 fi
 AM_CONDITIONAL(HAVE_GLIB, $have_glib)
 
-PKG_CHECK_MODULES(ICU, icu, have_icu=true, have_icu=false)
+dnl ==========================================================================
+
+PKG_CHECK_MODULES(CAIRO, cairo >= 1.8.0, have_cairo=true, have_cairo=false)
+if $have_cairo; then
+       AC_DEFINE(HAVE_CAIRO, 1, [Have cairo graphics library])
+fi
+AM_CONDITIONAL(HAVE_CAIRO, $have_cairo)
+
+PKG_CHECK_MODULES(CAIRO_PNG, cairo-png, have_cairo_png=true, have_cairo_png=false)
+if $have_cairo_png; then
+       AC_DEFINE(HAVE_CAIRO_PNG, 1, [Have cairo-png support in cairo graphics library])
+fi
+AM_CONDITIONAL(HAVE_CAIRO_PNG, $have_cairo_png)
+
+PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, have_cairo_ft=true, have_cairo_ft=false)
+if $have_cairo_ft; then
+       AC_DEFINE(HAVE_CAIRO_FT, 1, [Have cairo-ft support in cairo graphics library])
+fi
+AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft)
+
+dnl ==========================================================================
+
+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
 AM_CONDITIONAL(HAVE_ICU, $have_icu)
 
-PKG_CHECK_MODULES(GRAPHITE, silgraphite, have_graphite=true, have_graphite=false)
-if $have_graphite; then
-    AC_DEFINE(HAVE_GRAPHITE, 1, [Have Graphite library])
-fi
-AM_CONDITIONAL(HAVE_GRAPHITE, $have_graphite)
+dnl ==========================================================================
 
 PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=true, have_freetype=false)
 if $have_freetype; then
@@ -59,6 +106,7 @@ AC_CONFIG_FILES([
 harfbuzz.pc
 Makefile
 src/Makefile
+test/Makefile
 ])
 
 AC_OUTPUT