[svn] Specify "compilation environment" that works for Linux

and Solaris.
Published in <sxs8zlezpsu.fsf@florida.arsdigita.de>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a8cfcc9c0c27898e3494f90c00dffd45d00b403..90507a22046d3c72759edee797c558c1c3fefa44 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-06  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * config.h.in: Define "compilation environment" options that work
+       under Linux and Solaris.  To be reviewed on other OS'es.
+
 2001-04-06  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * http.c (gethttp): Prepend literal newline with `\n\'.

diff --git a/src/config.h.in b/src/config.h.in
index ed25b959f08e68433fa61a6fee19253d62963d3d..8d3b46625d7e60cab504503f775ad35a0105ee18 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -197,28 +197,24 @@ char *alloca ();
 /* Define to 1 if ANSI function prototypes are usable.  */
 #undef PROTOTYPES
 
-/* Debian says:
-
-   to get prototype for strptime, we need this  (taken from lftp)
-   #ifdef __linux__
-   #define __USE_XOPEN 1
-   #endif
+/* Define if all libs needed for ssl support are existing */
+#undef HAVE_SSL
 
-   But I don't think that's right.  The __USE_XOPEN thing is an
-   internal glibc2 thing that gets defined in features.h.  From
-   reading that file carefully, I think we need something like this
-   incantation to get the kind of features we use.
+/* The following several lines can be very dangerous; they can cripple
+   the header files and break compilation in _verY_ non-obvious ways.  If
+   compilation fails mysteriously and the errors are reported in
+   system headers, try commenting these out.  */
 
-   However, testing Wget under Solaris showed that compilation of
-   connect.c chokes because of the _XOPEN_SOURCE definition.  So I'm
-   disabling it.  If anyone understands this maze, please help!  */
+/* Request the "Unix 98 compilation environment". */
+#define _XOPEN_SOURCE 500
 
-#ifdef __linux__
-# define _XOPEN_SOURCE 500
-# define _SVID_SOURCE
-#endif
+/* For Solaris: request everything else that is available and doesn't
+   conflict with the above.  */
+#define __EXTENSIONS__
 
-/* Define if all libs needed for ssl support are existing */
-#undef HAVE_SSL
+/* For Linux: request features of 4.3BSD and SVID (System V Interface
+   Definition). */
+#define _SVID_SOURCE
+#define _BSD_SOURCE
 
 #endif /* CONFIG_H */