Remove all references to getopt_compat.h

This file is removed, so references to this file should be removed as well.

diff --git a/Makefile.am b/Makefile.am
index 442b6d12822cae7b5be4dcf716b4d848415e8ab7..3784dcf455689b1483015608a14382c823dc8f8d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ $(top_builddir)/graphviz_version.h: config.h
 EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \
        autogen.sh config/depcomp config/config.rpath \
        builddate.h ast_common.h.in compat.h \
-       Makeargs compat_getopt.h iffe config.iffe \
+       Makeargs iffe config.iffe \
        m4/README m4/iconv.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \
        graphviz.7 Doxyfile.in Doxyfile features awk \
        config/config_perl.pl config/config_python.py \

diff --git a/cmd/edgepaint/edgepaintmain.c b/cmd/edgepaint/edgepaintmain.c
index abfdbdbf3f402bd71ed6e3bfe2bc816b8303de68..23ee6e70f6907d749461ffaad59c920ab6870155 100644 (file)
--- a/cmd/edgepaint/edgepaintmain.c
+++ b/cmd/edgepaint/edgepaintmain.c
@@ -26,11 +26,7 @@
 #include <agxbuf.h>
 #include <ingraphs.h>
 #include <pointset.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #include "general.h"
 #include "SparseMatrix.h"

diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp
index 05c83583ec898e567945311f668a277e18d3c4b0..2510c7697277a5828aee73dd822dd8c0484dc50c 100644 (file)
--- a/cmd/gvedit/main.cpp
+++ b/cmd/gvedit/main.cpp
@@ -22,11 +22,7 @@
 /* #include <QTextStream> */
 #include "mainwindow.h"
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 #include "gvc.h"
 #include "globals.h"
 

diff --git a/cmd/gvmap/cluster.c b/cmd/gvmap/cluster.c
index 6c91dfb788e170c3322c1844cc8eb16646064351..bd74b66ccacefd2738151de43ce64d282a33aa61 100644 (file)
--- a/cmd/gvmap/cluster.c
+++ b/cmd/gvmap/cluster.c
@@ -20,11 +20,7 @@
 #include "QuadTree.h"
 #include <time.h>
 #include "SparseMatrix.h"
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 #include "string.h"
 #include "make_map.h"
 #include "spring_electrical.h"

diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c
index 65c30ad0ad6a3770098a1e76c59e47f24464e886..cabcb5a0c78e73cc2674bbec2402d94008a70b0a 100644 (file)
--- a/cmd/gvmap/gvmap.c
+++ b/cmd/gvmap/gvmap.c
@@ -20,11 +20,7 @@
 #include "QuadTree.h"
 #include <time.h>
 #include "SparseMatrix.h"
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 #include "string.h"
 #include "make_map.h"
 #include "spring_electrical.h"

diff --git a/cmd/mingle/minglemain.c b/cmd/mingle/minglemain.c
index f312a6ade3963d1556695f23ee2ff1d013e1e30f..d8cfb080f57ecd64732e05c0bacda9bc786aaa18 100644 (file)
--- a/cmd/mingle/minglemain.c
+++ b/cmd/mingle/minglemain.c
@@ -26,11 +26,7 @@
 #include <agxbuf.h>
 #include <ingraphs.h>
 #include <pointset.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #include "DotIO.h"
 #include "edge_bundling.h"

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index a082c3fddd76a2a56820710ecf0c653ecd118345..a3e6f6aa4113231ae5f20b0479e8cf8d667a993c 100755 (executable)
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -38,11 +38,7 @@
 #include "glexpose.h"
 #include "glutrender.h"
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #ifdef G_OS_WIN32
 gchar *package_prefix;

diff --git a/cmd/tools/acyclic.c b/cmd/tools/acyclic.c
index c734a4ef06c9c2c8e1772c410b96fd3824c32cbf..ce9732473b67d4dc0de30e1ae220d6dd2bcc436b 100644 (file)
--- a/cmd/tools/acyclic.c
+++ b/cmd/tools/acyclic.c
@@ -46,11 +46,7 @@ typedef struct {
 #define ND_onstack(n) (((Agnodeinfo_t*)((n)->base.data))->onstack)
 #define graphName(g) (agnameof(g))
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 static FILE *inFile;
 static FILE *outFile;

diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c
index 4263d999adaf9bf6d7b750ccece6ba1899eb421f..e5cf19c6ea12a10b17cc50c5b11371820d479f86 100644 (file)
--- a/cmd/tools/bcomps.c
+++ b/cmd/tools/bcomps.c
@@ -22,11 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #include <stdlib.h>
 #include "cgraph.h"

diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c
index 6f3dde0a9708370db782bfed2dd48b9452461690..8aa79c5a0b27b1af7e5b226996d177f3708f605c 100644 (file)
--- a/cmd/tools/ccomps.c
+++ b/cmd/tools/ccomps.c
@@ -44,11 +44,7 @@ typedef struct {
 #define ND_clust(n)  ((Agraph_t*)ND_ptr(n))
 #define agfindnode(G,N) (agnode(G, N, 0))
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c
index 79c030a32ab2b4dac8f34f55000206e191ef9709..07c6fc5b0794a5387c39a29329be2869b4dec61e 100644 (file)
--- a/cmd/tools/cvtgxl.c
+++ b/cmd/tools/cvtgxl.c
@@ -19,11 +19,7 @@
 #include "config.h"
 
 #include <ctype.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #include "convert.h"
 #include "ingraphs.h"

diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c
index 429f4a17096457b688b9379a5de02a7fef09c365..5708e1c3507f0c98a29757ac7a5a39dfee300add 100644 (file)
--- a/cmd/tools/dijkstra.c
+++ b/cmd/tools/dijkstra.c
@@ -25,11 +25,7 @@
 #include <math.h>
 #include "cgraph.h"
 #include "ingraphs.h"
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #ifndef HUGE
 /* HUGE is not defined on 64bit HP-UX */

diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c
index 965ba71bc72f71cdb47080cfd1bb184ae67e6365..eb5234d2485b6423b6c51fefc164bc7e668947de 100644 (file)
--- a/cmd/tools/gc.c
+++ b/cmd/tools/gc.c
@@ -43,11 +43,7 @@ typedef struct {
 
 #include "ingraphs.h"
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #define NODES 1
 #define EDGES 2

diff --git a/cmd/tools/gml2gv.c b/cmd/tools/gml2gv.c
index 2c573d2b99e4ba59c95eaebaa85c4cab1799db48..f96fbecc423cd94d8611fe9c93051413199f9c88 100644 (file)
--- a/cmd/tools/gml2gv.c
+++ b/cmd/tools/gml2gv.c
@@ -20,11 +20,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #define N_NEW(n,t)       (t*)malloc((n)*sizeof(t))
 

diff --git a/cmd/tools/gv2gml.c b/cmd/tools/gv2gml.c
index f6ffd990648562523ecb231efbfffda18f9c010d..346c01b907a666d94ed1c0da098be3fb88cba969 100644 (file)
--- a/cmd/tools/gv2gml.c
+++ b/cmd/tools/gv2gml.c
@@ -30,11 +30,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #include <cgraph.h>
 #include <ctype.h>

diff --git a/cmd/tools/gvcolor.c b/cmd/tools/gvcolor.c
index c4daf1476d39153166149c883a0efcb80d65876f..e0a99084fab990c7d3eaca2f9cde7b033c199d40 100644 (file)
--- a/cmd/tools/gvcolor.c
+++ b/cmd/tools/gvcolor.c
@@ -45,11 +45,7 @@ typedef struct Agnodeinfo_t {
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 double Defcolor[NC] = { 0.0, 0.0, 1.0 };       /* white */
 int Forward = 1;               /* how to propagate colors w.r.t. ranks */

diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
index d88aa413fc6a9e873147066d9d8ce8120e24040c..0a766bb6a797f4a74666d0cd4c393556aa2b76be 100644 (file)
--- a/cmd/tools/gvgen.c
+++ b/cmd/tools/gvgen.c
@@ -29,11 +29,7 @@
 #endif
 #include <string.h>
 #include <ctype.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 #include "graph_generator.h"
 
 typedef enum { unknown, grid, circle, complete, completeb, 

diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c
index 909559e6a197914c3c2c6418fbf621603f0347ef..cda9c0bac2a12e618bb811b950e2b7f40a872e4d 100644 (file)
--- a/cmd/tools/gvpack.c
+++ b/cmd/tools/gvpack.c
@@ -20,11 +20,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #include <assert.h>
 #include "gvc.h"

diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c
index 1d6577bcf92a227ea4c9c4ead0d1241876f9af23..2ebc5ad75b68973f0d56b39b0b03e489f72a6347 100644 (file)
--- a/cmd/tools/mm2gv.c
+++ b/cmd/tools/mm2gv.c
@@ -25,11 +25,7 @@
 #include "agxbuf.h"
 #include "SparseMatrix.h"
 #include "matrix_market.h"
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #define MALLOC malloc
 #define FREE free

diff --git a/cmd/tools/nop.c b/cmd/tools/nop.c
index ba1913ae4e433f8fb07a607befd6e91037ec95a9..bc3f37dd5f2de61a38a598670afc41d9f656a211 100644 (file)
--- a/cmd/tools/nop.c
+++ b/cmd/tools/nop.c
@@ -21,11 +21,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 char **Files;
 int chkOnly;

diff --git a/cmd/tools/sccmap.c b/cmd/tools/sccmap.c
index d62f192882c5f93c70978d629d2a446b4f44f6c1..68d1fa440c2af8aea6552f646621c1d99d979067 100644 (file)
--- a/cmd/tools/sccmap.c
+++ b/cmd/tools/sccmap.c
@@ -32,11 +32,7 @@
 #include "cgraph.h"
 #include "ingraphs.h"
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #define INF ((unsigned int)(-1))
 

diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c
index 399804fef409865b630014cd55c80842517425ef..ea15ecb8c17822cb3de81c3ebc53243c578a5dd0 100644 (file)
--- a/cmd/tools/tred.c
+++ b/cmd/tools/tred.c
@@ -39,11 +39,7 @@ typedef struct {
 #endif
 #include "ingraphs.h"
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 char **Files;
 char *CmdName;

diff --git a/cmd/tools/unflatten.c b/cmd/tools/unflatten.c
index 45b434c50bbd083cb2dfdfebf76bf536b1c02634..52f1f91da226029367ce8e4251ab0ce9835a0b2b 100644 (file)
--- a/cmd/tools/unflatten.c
+++ b/cmd/tools/unflatten.c
@@ -27,11 +27,7 @@
 #include    "cgraph.h"
 #include    "ingraphs.h"
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 static int Do_fans = 0;
 static int MaxMinlen = 0;

diff --git a/contrib/prune/prune.c b/contrib/prune/prune.c
index f99c0e72c86493b9d02a9d8e6355a64062fbb005..56fb457accd07c43789272726ed5a5417cd01ed2 100644 (file)
--- a/contrib/prune/prune.c
+++ b/contrib/prune/prune.c
@@ -21,11 +21,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #include "cgraph.h"
 #include "ingraphs.h"

diff --git a/doc/libgraph/sccmap.c b/doc/libgraph/sccmap.c
index 6d6d852516081cfaa2d3c4dee7e8be5794c8df4b..6808462b64be67de478fd377a4ad99271db84981 100644 (file)
--- a/doc/libgraph/sccmap.c
+++ b/doc/libgraph/sccmap.c
@@ -19,11 +19,7 @@
 #include "cgraph.h"
 #include "ingraphs.h"
 
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-#include "compat_getopt.h"
-#endif
 
 #define INF ((unsigned int)(-1))