strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

silence warnings from configure, get rid of $/ escapes

Browse source
This commit is contained in:
Christian Lohmaier 2011-06-14 02:20:17 +02:00
parent 4d00f79346
commit baa4d72f22
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libgsf/libgsf-1.14.19.patch
View file

@ -5,7 +5,7 @@
-
+if 0; then
+if false; then
case "$am__api_version" in
1.01234)
as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
@ -27,3 +27,12 @@
{ $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
@@ -12846,7 +12846,7 @@
fi
fi
-if test -n "$PKG_CONFIG"; then
+if test "$PKG_CONFIG" != "no" ; then
_pkg_min_version=0.9.0
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }

16
libgsf/makefile.mk
View file

@ -57,17 +57,17 @@ BUILD_DIR=gsf
BUILD_ACTION=dmake
ADDITIONAL_FILES=\
gsf$/makefile.mk \
gsf$/gsf-config.h
gsf/makefile.mk \
gsf/gsf-config.h
.ELSE
PATCH_FILES=libgsf-1.14.19.patch
CONFIGURE_DIR=
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
.$/configure \
--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
./configure \
--prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \
--without-python \
--without-bonobo \
@ -76,11 +76,11 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
--with-gdk_pixbuf \
--without-gnome-vfs \
--disable-nls \
LIBGSF_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
LIBGSF_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
LIBGSF_LIBS="-lxml2 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
LIBGSF_GIO_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
LIBGSF_GIO_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
LIBGSF_GIO_LIBS="-lgio-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0" \
GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \
GDK_PIXBUF_LIBS="-lgdk_pixbuf-2.0"