Version 3.6.0.4, tag libreoffice-3.6.0.4
[LibreOffice.git] / liblangtag / liblangtag-0.2-configure.patch
blobd78f4dde30984a583c952335c1cce08cc6afbda8
1 --- misc/liblangtag-0.2/configure 2012-02-02 11:04:11.000000000 +0100
2 +++ misc/build/liblangtag-0.2/configure 2012-05-24 22:50:18.991459556 +0200
3 @@ -13514,7 +13514,9 @@
4 no_glib=""
6 if test "x$PKG_CONFIG" = x ; then
7 - no_glib=yes
8 + if test "x$LIBO_GLIB_CHEAT" = x ; then
9 + no_glib=yes
10 + fi
11 PKG_CONFIG=no
14 @@ -13537,18 +13539,20 @@
17 if test x"$no_glib" = x ; then
18 - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
19 - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
20 - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
22 - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
23 - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
24 - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
25 - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
26 - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
27 - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
28 - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
29 - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
30 + if test "x$LIBO_GLIB_CHEAT" = x ; then
31 + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
32 + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
33 + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
35 + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
36 + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
37 + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
38 + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
39 + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
40 + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
41 + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
42 + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
43 + fi
44 if test "x$enable_glibtest" = "xyes" ; then
45 ac_save_CFLAGS="$CFLAGS"
46 ac_save_LIBS="$LIBS"