Fixed some problems building under cygwin

diff --git a/ChangeLog b/ChangeLog
index 245a9a4f2a332375b58a480c02e823ba191931dc..c7350c63e4f925770d7e50e7bc79609ab92898c1 100644 (file)
--- 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 214609fbae3b0ffd59ec403f42f3dba88eb39b69..0035b9e4fb6356dd66a9977c3b9020dca0a3ed44 100644 (file)
--- 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 bedc884dd1e9895fcae9378fde5c532df9167d60..e47445a1d73073f4eeb02882f73e7d38e3159b94 100644 (file)
--- 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 3e74f947eb4135b90e4de628eadc91384795f9ce..f770db3f37f3183172be21f6793ac314ee5be712 100644 (file)
--- 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