[Bug-wget] Two problems building wget 1.12 on Solaris 8

[Rainer Orth]

I've just tried to build wget 1.12 on Solaris 8/x86 with gcc 4.4.2 and
ran into two problems:

* Solaris 8 has <inttypes.h>, but no <stdint.h>, so compiling everything
  that includes sysdep.h fails.  The obvious fix is to protect the
  inclusion with HAVE_STDINT_H, which is already checked for.

* There's no <getopt.h>, either, so the generated one in
  $(top_builddir)/lib needs to be used instead.  Unfortunately, that
  directory isn't searched in a VPATH build.

The following patch fixes both issues and allowed wget to compile and
link successfully.

        Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University


2010-05-20  Rainer Orth  <address@hidden>

        * Makefile.am (AM_CPPFLAGS): Add $(top_builddir)/lib.
        * Makefile.in: Regenerate.
        * sysdep.h [HAVE_INTTYPES_H]: Only include <stdint.h> if present.

--- wget-1.12/src/Makefile.am.dist      2009-09-22 18:39:49.000000000 +0200
+++ wget-1.12/src/Makefile.am   2010-05-20 13:04:20.673939000 +0200
@@ -54,7 +54,7 @@ wget_SOURCES = cmpt.c connect.c convert.
 nodist_wget_SOURCES = version.c
 EXTRA_wget_SOURCES = mswindows.c iri.c
 LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
-AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib @MD5_CPPFLAGS@
 
 ../lib/libgnu.a:
        cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
--- wget-1.12/src/sysdep.h.dist 2010-05-20 12:56:39.931046000 +0200
+++ wget-1.12/src/sysdep.h      2009-09-04 18:31:54.000000000 +0200
@@ -117,9 +117,7 @@ void *alloca (size_t);
 
 #ifdef HAVE_INTTYPES_H
   /* Compaq C V6.5-303 (dtk) on HP Tru64 UNIX V5.1B (Rev. 2650) needs: */
-#if HAVE_STDINT_H
 # include <stdint.h>
-#endif
 # include <inttypes.h>
 #endif