This commit was manufactured by cvs2svn to create branch 'XEmacs-21_4'.

[chise/xemacs-chise.git.1] / lwlib / config.h.in

diff --git a/lwlib/config.h.in b/lwlib/config.h.in
index d94cb09..af8ab48 100644 (file)
--- a/lwlib/config.h.in
+++ b/lwlib/config.h.in
@@ -32,9 +32,16 @@ Boston, MA 02111-1307, USA.  */
 /* The path to the Athena widgets - the usual value is `X11/Xaw' */
 #undef ATHENA_H_PATH
 
-/* For use in #include statements.  This extra level of macro indirection
-   is necessary because you can't use macros directly within <> or "" */
+/* For use in #include statements.
+   You can't use macros directly within the <> of a #include statement.
+   The multiply nested macros are necessary to make old gcc's happy.
+   However, those nested macros are too much for AIX xlc to deal with. */
+#if defined(_AIX) && !defined(__GNUC__)
 #define ATHENA_INCLUDE(header_file) <ATHENA_H_PATH/header_file>
-
+#else
+#define INCLUDE_GLUE_2(dirname,basename) <##dirname##/##basename##>
+#define INCLUDE_GLUE_1(dirname,basename) INCLUDE_GLUE_2(dirname,basename)
+#define ATHENA_INCLUDE(header_file) INCLUDE_GLUE_1(ATHENA_H_PATH,header_file)
+#endif
 
 #endif /* _LWLIB_CONFIG_H_ */