diff options
Diffstat (limited to 'graphics/xaralx-devel/files/patch-configure.in')
| -rw-r--r-- | graphics/xaralx-devel/files/patch-configure.in | 56 |
1 files changed, 5 insertions, 51 deletions
diff --git a/graphics/xaralx-devel/files/patch-configure.in b/graphics/xaralx-devel/files/patch-configure.in index 57a7d0fcb6c2..8d33883a5b64 100644 --- a/graphics/xaralx-devel/files/patch-configure.in +++ b/graphics/xaralx-devel/files/patch-configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Sun May 7 23:30:33 2006 -+++ configure.in Mon May 8 16:38:54 2006 +--- configure.in.orig Wed May 10 14:01:21 2006 ++++ configure.in Wed May 10 14:04:32 2006 @@ -47,7 +47,7 @@ AC_PROG_INSTALL # We don't need dlopen right now and it's not supported on Darwin @@ -17,53 +17,7 @@ else AC_MSG_RESULT([not found]) fi -@@ -151,11 +150,40 @@ - fi - - # Test for libxml2 --# This is the simple version. Note that xml2-config script is also available --# for more detailed configuration. --LIBXML2_CFLAGS="" --LIBXML2_LIBS="" --PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6]) -+XML2CONFIG=xml2-config -+AC_ARG_WITH(xml2-config, -+[[ --with-xml2-config=FILE Use the given path to xml2-config when determining -+ libxml2 configuration; defaults to "xml2-config"]], -+[ -+ if test "$withval" != "yes" -a "$withval" != ""; then -+ XML2CONFIG=$withval -+ fi -+]) -+ -+xml2version=0 -+ -+AC_DEFUN([XML2TEST], -+[ -+ AC_REQUIRE([AC_PROG_AWK]) -+ AC_MSG_CHECKING([libxml2 version]) -+ if xml2version=`$XML2CONFIG --version`; then -+ AC_MSG_RESULT([$xml2version]) -+ else -+ AC_MSG_RESULT([not found]) -+ AC_MSG_ERROR([libxml2 is required. Try --with-xml2-config.]) -+ fi]) -+ -+# Call XML2TEST func -+XML2TEST -+ -+# check libxml2 version -+xml2version=`echo $xml2version | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'` -+if test -z "$xml2version" || test "$xml2version" -lt 2006000; then -+ AC_MSG_ERROR([libxml2 2.6 or newer is required]) -+fi -+ -+LIBXML2_CFLAGS="`$XML2CONFIG --cflags`" -+LIBXML2_LIBS="`$XML2CONFIG --libs`" - - # Define FTCONFIG - FTCONFIG=freetype-config -@@ -185,20 +213,7 @@ +@@ -215,20 +214,7 @@ # GTK build, so call FTTEST function to test for FreeType FTTEST FT_CFLAGS="`$FTCONFIG --cflags`" @@ -85,7 +39,7 @@ else # non-GTK build, i.e., MacOS, so Pango and FreeType are not required FT_CFLAGS="" -@@ -216,8 +231,8 @@ +@@ -246,8 +232,8 @@ fi # pass the Pango, FreeType and GTK flags (required for wxGTK font rendering) @@ -96,7 +50,7 @@ AC_MSG_CHECKING([Linker]) case $host in -@@ -256,6 +271,7 @@ +@@ -286,6 +272,7 @@ AM_CONDITIONAL(DARWIN_LINK, [test "$DarwinLink" = "yes"]) AC_SUBST(TOPDIR) |