oaf-config.in patch

[Owen Taylor <otaylor redhat com>]

Just committed the following to CVS. gcc-3.1 (and also various
random older systesm) get annoyed if you have /usr/include in your
cflags ... we used to have something like this in gtk-config
until we moved the headers into /usr/include/gtk-1.2.

Regards,
                                        Owen

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/oaf/ChangeLog,v
retrieving revision 1.196
diff -u -p -r1.196 ChangeLog
--- ChangeLog	13 Mar 2002 10:15:14 -0000	1.196
+++ ChangeLog	11 Apr 2002 19:24:14 -0000
@@ -1,3 +1,8 @@
+Thu Apr 11 15:23:01 2002  Owen Taylor  <otaylor redhat com>
+
+	* oaf-config.in: Strip out /usr/include from the
+	--cflags output.
+
 2002-03-12  Miles Lane <miles megapathdsl net>
 
 	* configure.in:  Added oafd/OAF_naming-service.oaf
Index: oaf-config.in
===================================================================
RCS file: /cvs/gnome/oaf/oaf-config.in,v
retrieving revision 1.6
diff -u -p -r1.6 oaf-config.in
--- oaf-config.in	4 Sep 2001 03:46:49 -0000	1.6
+++ oaf-config.in	11 Apr 2002 19:24:14 -0000
@@ -84,7 +84,12 @@ while test $# -gt 0; do
 done
 
 the_libs="$the_libs -L$libdir -loaf ` ORBIT_CONFIG@ --use-service=name --libs server`"
-the_flags="$the_flags -I$includedir ` ORBIT_CONFIG@ --cflags server`"
+
+if test $includedir != /usr/include ; then
+  the_flags="$the_flags -I$includedir ` ORBIT_CONFIG@ --cflags server`"
+else
+  the_flags="$the_flags ` ORBIT_CONFIG@ --cflags server`"
+fi
 
 if $cflags; then
     all_flags="$the_flags"