From 08c223898e143ba28b912ba118b4578b4de099e0 Mon Sep 17 00:00:00 2001
From: Stephen Watson <stephen@kerofin.demon.co.uk>
Date: Fri, 28 May 2004 15:26:56 +0000
Subject: [PATCH] r3537: Another place to look for apsymbols.h

---
 ROX-Filer/Help/Changes     | 4 ++++
 ROX-Filer/src/config.h.in  | 5 ++++-
 ROX-Filer/src/configure.in | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index 592875cf..4a43923a 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -2,6 +2,10 @@
 			A RISC OS-like filer for X
 			by Thomas Leonard
 
+28-May-2004
+~~~~~~~~~~~
+Another place to look for apsymbols.h (Stephen Watson).
+
 26-May-2004
 ~~~~~~~~~~~
 More fixes for the new build system (Stephen Watson).
diff --git a/ROX-Filer/src/config.h.in b/ROX-Filer/src/config.h.in
index f690fb43..cadaf468 100644
--- a/ROX-Filer/src/config.h.in
+++ b/ROX-Filer/src/config.h.in
@@ -15,6 +15,7 @@
 #undef WITH_GNOMEVFS
 #undef USE_PANGO_WRAP_WORD_CHAR
 #undef HAVE_APSYMBOLS_H
+#undef HAVE_APBUILD_APSYMBOLS_H
 
 #undef LARGE_FILE_SUPPORT
 
@@ -30,8 +31,10 @@
 # define _GNU_SOURCE
 #endif
 
-#ifdef HAVE_APSYMBOLS_H
+#if defined(HAVE_APSYMBOLS_H)
 # include <apsymbols.h>
+#elif defined(HAVE_APBUILD_APSYMBOLS_H)
+# include <apbuild/apsymbols.h>
 #endif
 
 #include "my_vfs.h"
diff --git a/ROX-Filer/src/configure.in b/ROX-Filer/src/configure.in
index 3ceb5300..00767a4f 100644
--- a/ROX-Filer/src/configure.in
+++ b/ROX-Filer/src/configure.in
@@ -132,7 +132,7 @@ AC_PATH_X
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h mntent.h sys/ucred.h sys/mntent.h apsymbols.h)
+AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h mntent.h sys/ucred.h sys/mntent.h apsymbols.h apbuild/apsymbols.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
-- 
2.11.4.GIT