X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lwlib%2Fconfig.h.in;h=00d3af1be3bc37fb8b6929312e731a1ee2489d3d;hb=2995885403846285f625f34b085a6d4473c8d43b;hp=af8ab48944ccdb81b58f19ed10803237b84639c7;hpb=3e447015251ce6dcde843cbed10d9033d5538622;p=chise%2Fxemacs-chise.git.1 diff --git a/lwlib/config.h.in b/lwlib/config.h.in index af8ab48..00d3af1 100644 --- a/lwlib/config.h.in +++ b/lwlib/config.h.in @@ -23,25 +23,24 @@ Boston, MA 02111-1307, USA. */ #ifndef _LWLIB_CONFIG_H_ #define _LWLIB_CONFIG_H_ -#include <../src/config.h> +#include "../src/config.h" #undef NEED_MOTIF #undef NEED_ATHENA #undef NEED_LUCID -/* The path to the Athena widgets - the usual value is `X11/Xaw' */ -#undef ATHENA_H_PATH - -/* 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) -#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 +/* The exact path to the Athena header files depends on which `flavor' + of Athena is being used - hence configure defines them for us. */ + +#undef ATHENA_Scrollbar_h_ +#undef ATHENA_Dialog_h_ +#undef ATHENA_Form_h_ +#undef ATHENA_Command_h_ +#undef ATHENA_Label_h_ +#undef ATHENA_LabelP_h_ +#undef ATHENA_Toggle_h_ +#undef ATHENA_ToggleP_h_ +#undef ATHENA_AsciiText_h_ +#undef ATHENA_XawInit_h_ #endif /* _LWLIB_CONFIG_H_ */