summary refs log tree commit diff
path: root/config.h.in
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-01-17 20:25:09 +0100
committerMichael Biebl <biebl@debian.org>2017-01-17 20:25:09 +0100
commit58f8be580039b0575b197b9573a1c92745d96d30 (patch)
tree2c226233f623a0dcb529be0eb8cdf97e4a2ae0c0 /config.h.in
parent45cb5bb3c0e6edb887cf69b417fcaf7053814a9b (diff)
New upstream version 1.5.90 upstream/1.5.90
Diffstat (limited to 'config.h.in')
-rw-r--r--config.h.in35
1 files changed, 17 insertions, 18 deletions
diff --git a/config.h.in b/config.h.in
index db8c135f..71a93990 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,16 +3,9 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
-/* Define if you we can build nm-setting-docs.xml, nm-keyfile-docs.xml and
-   nm-ifcfg-rh-docs.xml */
-#undef BUILD_SETTING_DOCS
-
 /* Path to ConsoleKit database */
 #undef CKDB_PATH
 
-/* Default configuration option for main.plugins setting */
-#undef CONFIG_PLUGINS_DEFAULT
-
 /* Define if dhcpcd supports IPv6 (6.x+) */
 #undef DHCPCD_SUPPORTS_IPV6
 
@@ -92,9 +85,6 @@
 /* Define if you have SELinux support */
 #undef HAVE_SELINUX
 
-/* Define if you have pre-built settings docs */
-#undef HAVE_SETTING_DOCS
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -149,18 +139,24 @@
 /* Path to netconfig */
 #undef NETCONFIG_PATH
 
-/* The default value of the auth-polkit configuration option */
-#undef NM_CONFIG_DEFAULT_AUTH_POLKIT
-
-/* Default value for main.rc-manager setting
-   (--with-config-dns-rc-manager-default) */
-#undef NM_CONFIG_DEFAULT_DNS_RC_MANAGER
-
 /* The default value of the logging.audit configuration option */
 #undef NM_CONFIG_DEFAULT_LOGGING_AUDIT
 
 /* Default configuration option for logging.backend */
-#undef NM_CONFIG_LOGGING_BACKEND_DEFAULT
+#undef NM_CONFIG_DEFAULT_LOGGING_BACKEND
+
+/* The default value of the auth-polkit configuration option */
+#undef NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT
+
+/* Default configuration option for main.dhcp setting */
+#undef NM_CONFIG_DEFAULT_MAIN_DHCP
+
+/* Default configuration option for main.plugins setting */
+#undef NM_CONFIG_DEFAULT_MAIN_PLUGINS
+
+/* Default value for main.rc-manager setting
+   (--with-config-dns-rc-manager-default) */
+#undef NM_CONFIG_DEFAULT_MAIN_RC_MANAGER
 
 /* Define the distribution version string */
 #undef NM_DIST_VERSION
@@ -228,6 +224,9 @@
 /* Define to path to system CA certificates */
 #undef SYSTEM_CA_PATH
 
+/* Define python path for test binary */
+#undef TEST_NM_PYTHON
+
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE