can't you just #ifndef around the defn in config.h? Martin Buchholz wrote: -- Ben In order to save my hands, I am cutting back on my mail. I also write as succinctly as possible -- please don't be offended. If you send me mail, you _will_ get a response, but please be patient, especially for XEmacs-related mail. If you need an immediate response and it is not apparent in your message, please say so. Thanks for your understanding. See also http://www.666.com/ben/chronic-pain/

Vin> I recently installed XFree86-4.01 (from a contributed Mandrake RPM), Vin> and I found I could not configure 21.2 from the CVS sources, because Vin> configure detects that: Vin> #define _XOPEN_SOURCE 500 Vin> should be defined in confdefs.h, and xmkmf has the following defines: Vin> -D_POSIX_SOURCE -D_XOPEN_SOURCE Vin> this causes confdefs.h to have both: Vin> #define _XOPEN_SOURCE 500 Vin> ... Vin> #define _XOPEN_SOURCE 1 Vin> This, in turn, causes the search for X11/Intrinsic.h to fail because Vin> gcc emits the following errors: Vin> confdefs.h:67: warning: `_XOPEN_SOURCE' redefined Vin> confdefs.h:25: warning: this is the location of the previous definition Vin> I have worked around the problem for the moment by changing the Vin> definition in xmkmf to -D_XOPEN_SOURCE=500, but this problem probably Vin> needs to be fixed. Martin, what's the best way to fix this? I built XFree86 on my Linux system today, and did NOT have this problem. Everything is fine. The symbols defined by xmkmf are: checking for X defines extracted by xmkmf Defining NARROWPROTO Defining linux Defining __i386__ Defining _POSIX_SOURCE Defining _BSD_SOURCE Defining _SVID_SOURCE However, in xc/config/cf/linux.cf, I see: #if LinuxCLibMajorVersion >= 6 #define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ -D_POSIX_SOURCE -D_XOPEN_SOURCE \ -D_BSD_SOURCE -D_SVID_SOURCE \ LinuxAdditionalIncludes LinuxGnuSourceDefines \ LinuxLocaleDefines #else #define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ -D_BSD_SOURCE -D_SVID_SOURCE \ LinuxGnuSourceDefines LinuxLocaleDefines This doesn't make sense to me, because I also have libc6: (martin＠lasker) ~cdx/import/xfree86/xc $ make VerifyOS make -f xmakefile VerifyOS make[1]: Entering directory `/project/xemacs/import/xfree86/xc' Building on Linux 2.2.13-23 i686 [ELF] (2.2.13). Linux Distribution: Unknown libc version: 6.1.2 binutils version: 2.9 I could try to fix this without being able to reproduce the problem, but I try to avoid doing this, especially when I don't understand how the XFree86 config magic happens.

Vin> I recently installed XFree86-4.01 (from a contributed Mandrake RPM), Vin> and I found I could not configure 21.2 from the CVS sources, because Vin> configure detects that: Vin> #define _XOPEN_SOURCE 500 Vin> should be defined in confdefs.h, and xmkmf has the following defines: Vin> -D_POSIX_SOURCE -D_XOPEN_SOURCE Vin> this causes confdefs.h to have both: Vin> #define _XOPEN_SOURCE 500 Vin> ... Vin> #define _XOPEN_SOURCE 1 Here's the patch: 2000-07-12 Martin Buchholz <martin(a)xemacs.org&gt; * configure.in: Rewrite xmkmf symbol detection to avoid redefinition of symbols we've already defined. Also, handle xmkmf symbols with values other than 1. Index: configure.in =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs/configure.in,v retrieving revision 1.111.2.110 diff -u -r1.111.2.110 configure.in --- configure.in 2000/07/10 05:31:49 1.111.2.110 +++ configure.in 2000/07/12 08:37:16 ＠＠ -2601,10 +2602,19 ＠＠ cd .. rm -fr conftestdir for word in $xmkmf_defines; do - case "$word" in - -D*=* ) ;; - -D* ) word=`echo '' $word | sed -e 's:^ *-D::'` - AC_DEFINE_UNQUOTED($word) ;; + case "$word" in -D* ) + sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'` + case "$word" in + -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;; + * ) val=1 ;; + esac +dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above. + if grep "^#define $sym " confdefs.h >/dev/null; then :; else + if test "$val" = "1" + then AC_DEFINE_UNQUOTED($sym) + else AC_DEFINE_UNQUOTED($sym,$val) + fi + fi ;; esac done fi