Rename our getopt.h to getopt_long.h.

That way, if we *do* have getopt_long(), we don't end up including our
getopt.h rather than the system's getopt.h.

Makefile.in

@@ -236,7 +236,7 @@ HDR = \
 	ether.h \
 	ethertype.h \
 	extract.h \
-	getopt.h \
+	getopt_long.h \
 	gmpls.h \
 	gmt2local.h \
 	interface.h \

getopt_long.h

@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _GETOPT_H_
-#define _GETOPT_H_
+#ifndef _GETOPT_LONG_H_
+#define _GETOPT_LONG_H_
 
 /*
  * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
@@ -63,4 +63,4 @@ int	getopt_long_only(int, char * const *, const char *,
 extern char *optarg;			/* getopt(3) external variables */
 extern int optind, opterr, optopt;
  
-#endif /* !_GETOPT_H_ */
+#endif /* !_GETOPT_LONG_H_ */

tcpdump.c

@@ -60,7 +60,7 @@ extern int SIZE_BUF;
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #else
-#include "getopt.h"
+#include "getopt_long.h"
 #endif
 #include <pcap.h>
 #include <signal.h>