diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-08-12 19:45:50 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-08-12 19:45:50 -0400 |
| commit | 4770396ca172bab95dd4d0b34a272816f1b26922 (patch) | |
| tree | e304d8d93a02e970c946c3991569869152f206b0 | |
| parent | 7380a171e933b8690146d2976caf0c5abafbed91 (diff) | |
| download | pango-4770396ca172bab95dd4d0b34a272816f1b26922.tar.gz | |
Bug 591413 – needs to link with libstdc++
Enforce -fno-exceptions better.
| -rw-r--r-- | configure.in | 29 | ||||
| -rw-r--r-- | pango/opentype/Makefile.am | 2 |
2 files changed, 27 insertions, 4 deletions
diff --git a/configure.in b/configure.in index fb4a7abc..df6cc7bc 100644 --- a/configure.in +++ b/configure.in @@ -111,8 +111,32 @@ AC_SUBST(LIB_EXE_MACHINE_FLAG) AM_CONDITIONAL(OS_WIN32, test "$pango_os_win32" = "yes") AC_PROG_CC -AC_PROG_CXX + +dnl +dnl Check for a working C++ compiler, but do not bail out, if none is found. +dnl We use this for an automated test for C++ header correctness. +dnl +AC_CHECK_PROGS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc) +AC_LANG_SAVE +AC_LANG_CPLUSPLUS +AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "") +AC_LANG_RESTORE + +# +# Checks for HarfBuzz +# + +AC_PROG_CXX +AC_CHECK_FUNCS(mprotect) + +# Make sure we don't link to libstdc++ (needs de-gcc-fication) +CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + +# +# Win32 stuff +# AC_LIBTOOL_WIN32_DLL AM_DISABLE_STATIC @@ -602,8 +626,7 @@ AM_CONDITIONAL(DYNAMIC_TIBETAN_FC, echo $dynamic_modules | egrep '(^|,)tibetan-f # We use flockfile to implement pango_getline() - should be moved to GLib # strtok_r isn't present on some systems # -# mprotect is for HarfBuzz -AC_CHECK_FUNCS(flockfile strtok_r mprotect) +AC_CHECK_FUNCS(flockfile strtok_r) dnl ************************** dnl *** Checks for gtk-doc *** diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index 6c41d9ee..b55ea1f4 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -3,7 +3,7 @@ NULL = # The following warning options are useful for debugging: -Wpadded -Wcast-align -AM_CXXFLAGS = -fno-rtti -fno-exceptions +#AM_CXXFLAGS = noinst_LTLIBRARIES = libharfbuzz.la |