From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 12 Dec 2003 03:36:19 +0000 (+0000)
Subject: Fixed some problems building under cygwin
X-Git-Tag: v0.4.0~470
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aba9566fe44125ef2962a07a1fe1d7d006b6c41;p=pspp-builds.git

Fixed some problems building under cygwin
---

diff --git a/ChangeLog b/ChangeLog
index 245a9a4f..c7350c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Thu Dec 11 19:35:32 WST 2003 John Darrington <john@darrington.wattle.id.au>
 
 	* Removed autogenerated files from the CVS archive
 
+        * removed the included getopt.c as it failed to build under some
+        systems.
+
 Thu Dec 11 00:12:19 2003  Ben Pfaff  <blp@gnu.org>
 
 	* Update build system to Autoconf 2.58, Automake 1.7, gettext
diff --git a/configure.ac b/configure.ac
index 214609fb..0035b9e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,10 @@ AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(gmp, mpf_get_str, [LIBS="-lgmp $LIBS"],
 	     [AC_CHECK_LIB(gmp, __gmpf_get_str, [LIBS="-lgmp $LIBS"])],
 	     AC_MSG_ERROR(`You must install libgmp'))
+
+AC_CHECK_FUNC(getopt_long,,
+	AC_MSG_ERROR(`This application depends upon getopt_long'))
+
   
 AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes,
   AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes,
diff --git a/lib/misc/Makefile.am b/lib/misc/Makefile.am
index bedc884d..e47445a1 100644
--- a/lib/misc/Makefile.am
+++ b/lib/misc/Makefile.am
@@ -5,7 +5,7 @@ noinst_LIBRARIES = libmisc.a
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir) \
 -I$(top_srcdir)/intl
 
-libmisc_a_SOURCES = qsort.c getopt.c getopt1.c
+libmisc_a_SOURCES = qsort.c 
 libmisc_a_LIBADD = @ALLOCA@ @LIBOBJS@
 libmisc_a_DEPENDENCIES = @ALLOCA@ @LIBOBJS@
 
diff --git a/lib/misc/getdelim.c b/lib/misc/getdelim.c
index 3e74f947..f770db3f 100644
--- a/lib/misc/getdelim.c
+++ b/lib/misc/getdelim.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <stddef.h>
 #include <stdio.h>
-#include "common.h"
 
 /* Reads a DELIMITER-separated field of any length from file STREAM.
    *LINEPTR is a malloc'd string of size N; if *LINEPTR is NULL, it is