Clean up indentation.

[metze/wireshark/wip.git] / cmakeconfig.h.in

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index c0ba3aa40c3d0038a1f47eeaa41125b8a5a6c600..8578ef05be8f641e83b9eb59e0850f4b1587665f 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -18,9 +18,6 @@
 /* Directory where plugins reside */
 #define PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}"
 
-/* Define to 1 if we want to use threads in wireshark and dumpcap */
-#cmakedefine USE_THREADS 1
-
 /* Define to 1 if we want to use pcap-ng as our default file format */
 #cmakedefine PCAP_NG_DEFAULT 1
 
@@ -49,7 +46,7 @@
 #cmakedefine HAVE_FCNTL_H 1
 
 /* Define to 1 if you have the <getopt.h> header file. */
-#cmakedefine HAVE_GETOPT_H 1
+#cmakedefine HAVE_GETOPT 1
 
 /* Define to 1 if you have the `chown' function. */
 #cmakedefine HAVE_CHOWN 1
@@ -72,6 +69,9 @@
 /* Define to use GEOIP library */
 #cmakedefine HAVE_GEOIP 1
 
+/* Define if GEOIP library supports IPv6 (GeoIP 1.4.5 and later) */
+#cmakedefine HAVE_GEOIP_V6 1
+
 /* Define to use capabilities library */
 #cmakedefine HAVE_LIBCAP 1
 
@@ -108,9 +108,6 @@
 /* Define to use libpcap library */
 #cmakedefine HAVE_LIBPCAP 1
 
-/* Define to use libpcre library */
-#cmakedefine HAVE_LIBPCRE 1
-
 /* Define to use dbus-glib library */
 #cmakedefine HAVE_LIBDBUS 1
 
@@ -371,3 +368,10 @@
    `char[]'. */
 /* Note: not use in the code */
 #cmakedefine YYTEXT_POINTER
+
+/* _U_ isn't needed for C++, simply don't name the variable.
+   Also, running moc with -D_U_... breaks cmake's auto escaping magic. */
+#ifndef __cplusplus
+# define _U_ ${C_UNUSED}
+#endif
+