From 0019475d4d62544656d0528a3f22740fa2620b90 Mon Sep 17 00:00:00 2001 From: soochoi Date: Mon, 8 Jan 2007 08:35:24 +0000 Subject: [PATCH] CASA: check in autobuild failure due to glib update in stable dist --- CASA/adlib/ad_gk/native/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CASA/adlib/ad_gk/native/Makefile.am b/CASA/adlib/ad_gk/native/Makefile.am index 9acc0fcd..4feafaf7 100644 --- a/CASA/adlib/ad_gk/native/Makefile.am +++ b/CASA/adlib/ad_gk/native/Makefile.am @@ -55,6 +55,8 @@ INCLUDES = -I. -I.. -I$(CASAROOT)/include \ -I/opt/gnome/include/gnome-keyring-1 \ -I/opt/gnome/include/glib-2.0 \ -I/opt/gnome/$(LIBDIR)/glib-2.0/include \ + -I/usr/include/glib-2.0 \ + -I/usr/$(LIBDIR)/glib-2.0/include \ -L/opt/gnome/$(LIBDIR) -lglib-2.0 RESOURCES = @@ -65,7 +67,7 @@ LIBS = -lpthread -ldl LDFLAGS = -fno-exceptions -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \ -Wl,-rpath -Wl,/usr/$(LIBDIR) -Wl,-soname -Wl,libad_gk.so.1 -EXTRA_LDFLAGS = -L/opt/gnome/$(LIBDIR) -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR) +EXTRA_LDFLAGS = -L/opt/gnome/$(LIBDIR) -L/usr/include -lglib-2.0 -L/$(CASAROOT)/$(LIBDIR) OBJDIR = ./$(TARGET_CFG)/$(LIBDIR)