Autoconf, CMake: Define PACKAGE_URL.

Make CMake PACKAGE_xxxxx definitions in config.h reproduce Autoconf in
the same go.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 686e980437867d7d96d8d132e8ce7791ca7c9f2c..208e1c1863e944b45185ab0dbf67754f64648a0e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -346,6 +346,7 @@ endif()
 
 ###################################################################
 #   Versioning
+# (and other variables to keep config.h consistent with Autoconf)
 ###################################################################
 
 # Get, parse, format and set tcpdump's version string from
@@ -357,6 +358,12 @@ file(STRINGS ${tcpdump_SOURCE_DIR}/VERSION
     LIMIT_COUNT 1 # Read only the first line
 )
 
+set(PACKAGE_BUGREPORT "https://github.com/the-tcpdump-group/tcpdump/issues")
+set(PACKAGE_NAME "tcpdump")
+set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
+set(PACKAGE_TARNAME "${PACKAGE_NAME}")
+set(PACKAGE_URL "https://www.tcpdump.org/")
+
 ######################################
 # Project settings
 ######################################

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 2b87a6f4880d76e76cd7e2631d9c7e3d921bf0c7..82a4a4bf1ddf63c88de6eab47557c01b460492be 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -136,7 +136,7 @@
 #cmakedefine NET_ETHERNET_H_DECLARES_ETHER_NTOHOST 1
 
 /* Define to the address where bug reports for this package should be sent. */
-#cmakedefine PACKAGE_BUGREPORT ""
+#cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
 
 /* Define to the full name of this package. */
 #cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
@@ -145,10 +145,10 @@
 #cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
 
 /* Define to the one symbol short name of this package. */
-#cmakedefine PACKAGE_TARNAME ""
+#cmakedefine PACKAGE_TARNAME "@PACKAGE_TARNAME@"
 
 /* Define to the home page for this package. */
-#cmakedefine PACKAGE_URL ""
+#cmakedefine PACKAGE_URL "@PACKAGE_URL@"
 
 /* Define to the version of this package. */
 #cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"

diff --git a/configure.ac b/configure.ac
index c0a00fe7fa3633b02ae8ca15df71679244f2a460..ebfc40c359ddbe72c1e17f18f565c8d900496f0c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,12 @@ dnl
 #
 
 AC_PREREQ([2.69])
-AC_INIT([tcpdump],[m4_esyscmd_s(cat VERSION)],[https://github.com/the-tcpdump-group/tcpdump/issues])
+AC_INIT(
+       [tcpdump],
+       [m4_esyscmd_s(cat VERSION)],
+       [https://github.com/the-tcpdump-group/tcpdump/issues],
+       [tcpdump],
+       [https://www.tcpdump.org/])
 AC_CONFIG_SRCDIR(tcpdump.c)
 
 AC_CANONICAL_HOST