projects
/
framework
/
uifw
/
harfbuzz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add AC_CANONICAL_HOST
[framework/uifw/harfbuzz.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
3e83a38
..
c0ff166
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-12,6
+12,8
@@
AM_INIT_AUTOMAKE([1.11.1 gnu dist-bzip2 no-dist-gzip -Wall no-define])
AM_SILENT_RULES([yes])
AM_SILENT_RULES([yes])
+AC_CANONICAL_HOST
+
# Check for programs
AC_PROG_CC
AM_PROG_CC_C_O
# Check for programs
AC_PROG_CC
AM_PROG_CC_C_O
@@
-21,22
+23,34
@@
AC_PROG_CXX
LT_PREREQ([2.2])
LT_INIT([win32-dll])
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)
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
if test "x$GCC" = "xyes"; then
+
+ # Make sure we don't link to libstdc++
CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+ case "$host" in
+ arm-*-*)
+ # Request byte alignment on arm
+ CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
+ ;;
+ esac
fi
dnl ==========================================================================
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)
if $have_glib; then
AC_DEFINE(HAVE_GLIB, 1, [Have glib2 library])
fi
AM_CONDITIONAL(HAVE_GLIB, $have_glib)
+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])
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])
@@
-55,6
+69,8
@@
if $have_cairo_ft; then
fi
AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft)
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
PKG_CHECK_MODULES(ICU, icu, have_icu=true, [
AC_CHECK_PROG([have_icu], [icu-config], [true], [false])
if $have_icu; then
@@
-69,6
+85,8
@@
if $have_icu; then
fi
AM_CONDITIONAL(HAVE_ICU, $have_icu)
fi
AM_CONDITIONAL(HAVE_ICU, $have_icu)
+dnl ==========================================================================
+
PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=true, have_freetype=false)
if $have_freetype; then
AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library])
PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=true, have_freetype=false)
if $have_freetype; then
AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library])
@@
-88,6
+106,7
@@
AC_CONFIG_FILES([
harfbuzz.pc
Makefile
src/Makefile
harfbuzz.pc
Makefile
src/Makefile
+test/Makefile
])
AC_OUTPUT
])
AC_OUTPUT