Make building with GeoIP, Python, Capabilities and c-ares

actually work.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29870 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 15 insertions, 3 deletions

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 699bd26f94..98ab89b559 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -1,5 +1,8 @@
 /* cmakeconfig.h.in */
 
+/* Version number of package */
+#define VERSION "@CPACK_PACKAGE_VERSION@"
+
 /* Directory for data */
 #define DATAFILE_DIR "@CMAKE_INSTALL_PREFIX@/share/@CPACK_PACKAGE_NAME@"
 
@@ -42,6 +45,12 @@
 /* Define to use SMI SNMP library */
 #cmakedefine HAVE_LIBSMI 1
 
+/* Define to use GEOIP library */
+#cmakedefine HAVE_GEOIP 1
+
+/* Define to use capabilities library */
+#cmakedefine HAVE_LIBCAP 1
+
 /* Define to use GNU ADNS library */
 #cmakedefine HAVE_GNU_ADNS 1
 
@@ -105,6 +114,12 @@
 /* Define to 1 if you have the <lua.h> header file. */
 #cmakedefine HAVE_LUA_H 1
 
+/* Define to 1 if you have libpython. */
+#cmakedefine HAVE_PYTHON 1
+
+/* Path to Python. */
+#cmakedefine PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/${CPACK_PACKAGE_NAME}/python/${VERSION}"
+
 /* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine HAVE_MEMORY_H 1
 
@@ -304,9 +319,6 @@
 /* Note: not use in the code */
 #cmakedefine STDC_HEADERS 1
 
-/* Version number of package */
-#define VERSION "@CPACK_PACKAGE_VERSION@"
-
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine WORDS_BIGENDIAN 1