diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-05-30 21:27:17 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-05-30 21:28:34 +0200 |
| commit | 44e6861f7e35e52fe66a3be6386b540a4e53e9ec (patch) | |
| tree | bcba8fe1a9b856660a1bba22f72b55fc5db5b731 /libgsf | |
| parent | 743840a403640c86dbd60cef9a3ff296c21e4287 (diff) | |
fix build on Mac (add LIBXML_CFLAGS, disable unneeded intltool-xml check)
Diffstat (limited to 'libgsf')
| -rw-r--r-- | libgsf/libgsf-1.14.19.patch | 9 | ||||
| -rwxr-xr-x | libgsf/makefile.mk | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libgsf/libgsf-1.14.19.patch b/libgsf/libgsf-1.14.19.patch index a39758367f83..12d20c660129 100644 --- a/libgsf/libgsf-1.14.19.patch +++ b/libgsf/libgsf-1.14.19.patch @@ -18,3 +18,12 @@ +@@ -11963,7 +11963,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 + $as_echo "$IT_PERL_VERSION" >&6; } + fi +-if test "x" != "xno-xml"; then ++if test "xno-xml" != "xno-xml"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 + $as_echo_n "checking for XML::Parser... " >&6; } + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk index fc2897deaec1..955925ff7ce2 100755 --- a/libgsf/makefile.mk +++ b/libgsf/makefile.mk @@ -37,8 +37,8 @@ TARGET=so_libgsf .IF "$(SYSTEM_LIBGSF)" == "YES" all: - @echo "An already available installation of gdk-pixbuf should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." + @echo "An already available installation of gdk-pixbuf should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." .ENDIF # --- Files -------------------------------------------------------- @@ -67,7 +67,7 @@ CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ .$/configure \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR)" \ --without-python \ --without-bonobo \ |