Check for getopt_long(), not getopt().

We support three types of platforms:

	1) UN*Xes that have both getopt() and getopt_long();

	2) UN*Xes that have getopt() but not getopt_long();

	3) Windows, which has neither.

Checking for getopt_long() lets us distinguish between 1) and 2) and
build getopt_long() for them.

Change-Id: Iaf0f142f9bebaa2eed2128d544ec9786711def45
Reviewed-on: https://code.wireshark.org/review/6045
Reviewed-by: Guy Harris <guy@alum.mit.edu>

ConfigureChecks.cmake

@@ -77,7 +77,7 @@ cmake_pop_check_state()
 #
 check_symbol_exists("floorl" "math.h"    HAVE_FLOORL)
 check_function_exists("gethostbyname2"   HAVE_GETHOSTBYNAME2)
-check_function_exists("getopt"           HAVE_GETOPT)
+check_function_exists("getopt_long"      HAVE_GETOPT_LONG)
 check_function_exists("getprotobynumber" HAVE_GETPROTOBYNUMBER)
 check_function_exists("inet_aton"        HAVE_INET_ATON)
 check_function_exists("inet_ntop"        HAVE_INET_NTOP_PROTO)

capinfos.c

@@ -100,7 +100,7 @@
 #include <wsutil/wsgcrypt.h>
 #endif
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

captype.c

@@ -70,7 +70,7 @@
 #include <wsutil/unicode-utils.h>
 #endif /* _WIN32 */
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

cmakeconfig.h.in

@@ -72,8 +72,8 @@
 /* Define to 1 if you have the `gethostbyname2' function. */
 #cmakedefine HAVE_GETHOSTBYNAME2 1
 
-/* Define to 1 if you have the getopt function. */
+/* Define to 1 if you have the getopt_long function. */
-#cmakedefine HAVE_GETOPT 1
+#cmakedefine HAVE_GETOPT_LONG 1
 
 /* Define to 1 if you have the <getopt.h> header file. */
 #cmakedefine HAVE_GETOPT_H 1

configure.ac

@@ -2665,10 +2665,10 @@ AC_C_BIGENDIAN
 # XXX - do we need this?
 AC_PROG_GCC_TRADITIONAL
 
-AC_CHECK_FUNC(getopt,
+AC_CHECK_FUNC(getopt_long,
   [
     GETOPT_LO=""
-    AC_DEFINE(HAVE_GETOPT, 1, [Define to 1 if you have the getopt function.])
+    AC_DEFINE(HAVE_GETOPT_LONG, 1, [Define to 1 if you have the getopt_long function.])
   ],
   GETOPT_LO="wsgetopt.lo")
 AC_SUBST(GETOPT_LO)

dumpcap.c

@@ -74,7 +74,7 @@
 #include <wsutil/crash_info.h>
 #include <wsutil/ws_version_info.h>
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

editcap.c

@@ -64,7 +64,7 @@
 
 #include "wtap.h"
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

mergecap.c

@@ -49,7 +49,7 @@
 #include <string.h>
 #include "wtap.h"
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include <wsutil/wsgetopt.h>
 #endif
 

randpkt.c

@@ -27,7 +27,7 @@
 #include <unistd.h>
 #endif
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

rawshark.c

@@ -60,7 +60,7 @@
 # include <sys/stat.h>
 #endif
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

reordercap.c

@@ -42,7 +42,7 @@
 
 #include "wtap.h"
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

text2pcap.c

@@ -133,7 +133,7 @@
 #include <zlib.h>      /* to get the libz version number */
 #endif
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

tfshark.c

@@ -53,7 +53,7 @@
 #include <zlib.h>      /* to get the libz version number */
 #endif
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

tshark.c

@@ -58,7 +58,7 @@
 # include <sys/capability.h>
 #endif
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

ui/gtk/main.c

@@ -40,7 +40,7 @@
 #include <unistd.h>
 #endif
 
-#ifndef HAVE_GETOPT
+#ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
 #endif
 

ui/qt/main.cpp

@@ -33,10 +33,12 @@
 #include <zlib.h>	/* to get the libz version number */
 #endif
 
-#ifndef HAVE_GETOPT
+#ifdef HAVE_GETOPT_H
-#  include "wsutil/wsgetopt.h"
+#include <getopt.h>
-#else
+#endif
-#  include <getopt.h>
+
+#ifndef HAVE_GETOPT_LONG
+#include "wsutil/wsgetopt.h"
 #endif
 
 #include <wsutil/clopts_common.h>

wsutil/CMakeLists.txt

@@ -85,7 +85,7 @@ if(HAVE_SSE4_2)
 	set(WSUTIL_FILES ${WSUTIL_FILES} ws_mempbrk_sse42.c)
 endif()
 
-if(NOT HAVE_GETOPT)
+if(NOT HAVE_GETOPT_LONG)
 	set(WSUTIL_FILES ${WSUTIL_FILES} wsgetopt.c)
 endif()