blob: bf5b8a0272192f0d66da1689d1f4af401cc7e8b5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
$NetBSD: patch-aj,v 1.4 2001/10/30 17:47:20 drochner Exp $
--- src/config/abi_defs.mk.orig Sat Sep 22 00:16:17 2001
+++ src/config/abi_defs.mk Tue Oct 30 16:55:51 2001
@@ -587,7 +587,7 @@
ABI_OPTIONS +=GnomeVFS:On
endif
-GNOME_CFLAGS += $(shell glib-config --cflags)
+GNOME_CFLAGS += $(shell $(GLIB_CONFIG) --cflags)
# the bonobo target is known not to work properly yet
ifdef ABI_OPT_BONOBO
@@ -617,7 +617,7 @@
ABI_OPT_GNOME=
GTK_CFLAGS := $(shell $(GTK_CONFIG) --cflags)
GTK_LIBS := $(shell $(GTK_CONFIG) --libs)
-GLIB_CFLAGS := $(shell glib-config --cflags)
+GLIB_CFLAGS := $(shell $(GLIB_CONFIG) --cflags)
CFLAGS += $(GTK_CFLAGS) $(GLIB_CFLAGS)
EXTRA_LIBS += $(GTK_LIBS)
#
@@ -705,7 +705,7 @@
# it's the easiest way to ensure that we always include iconv.h
# with it set (to prevent linker mismatches with wv's version)
#
-CFLAGS += -DLIBICONV_PLUG
+#CFLAGS += -DLIBICONV_PLUG
ifeq ($(ABI_NATIVE),unix)
CFLAGS += -DSUPPORTS_UT_IDLE=1
|
