1 files changed, 30 insertions, 21 deletions

diff --git a/configure b/configure
index dfb9da76..8ebbd40f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager 1.1.92.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.1.93.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.1.92'
-PACKAGE_STRING='NetworkManager 1.1.92'
+PACKAGE_VERSION='1.1.93'
+PACKAGE_STRING='NetworkManager 1.1.93'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1685,7 +1685,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NetworkManager 1.1.92 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.1.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1755,7 +1755,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.1.92:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.1.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1844,7 +1844,7 @@ Optional Packages:
                           'no' not to install the udev rules
   --with-systemdsystemunitdir=DIR
                           Directory for systemd service files
-  --with-hostname-persist=default|suse|gentoo
+  --with-hostname-persist=default|suse|gentoo|slackware
                           Hostname persist method
   --with-systemd-journal=yes|no
                           Use systemd journal for logging
@@ -2062,7 +2062,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.1.92
+NetworkManager configure 1.1.93
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2789,7 +2789,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager $as_me 1.1.92, which was
+It was created by NetworkManager $as_me 1.1.93, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3659,7 +3659,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.1.92'
+ VERSION='1.1.93'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17540,9 +17540,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 NM_MAJOR_VERSION=1
 NM_MINOR_VERSION=1
-NM_MICRO_VERSION=92
-NM_VERSION=1.1.92
-NM_GIT_SHA=24caeb33b7f2a2a80ee4484844810bc08d32f28c
+NM_MICRO_VERSION=93
+NM_VERSION=1.1.93
+NM_GIT_SHA=aab24b4e10e6a9ad0b51d3e573b5da7ddafbf50b
 
 
 
@@ -22145,6 +22145,9 @@ fi
 if test "$with_hostname_persist" = "gentoo"; then :
   hostname_persist=gentoo
 fi
+if test "$with_hostname_persist" = "slackware"; then :
+  hostname_persist=slackware
+fi
 if test "$with_hostname_persist" = "default"; then :
   hostname_persist=default
 fi
@@ -22155,6 +22158,9 @@ fi
 if test -z "$hostname_persist" -a "$distro_plugins" = "ifnet"; then :
   hostname_persist=gentoo
 fi
+if test -z "$hostname_persist" -a -f /etc/slackware-version; then :
+  hostname_persist=slackware
+fi
 if test -z "$hostname_persist"; then :
   hostname_persist=default
 fi
@@ -22167,6 +22173,10 @@ elif test "$hostname_persist" = gentoo; then
 
 $as_echo "#define HOSTNAME_PERSIST_GENTOO 1" >>confdefs.h
 
+elif test "$hostname_persist" = slackware; then
+
+$as_echo "#define HOSTNAME_PERSIST_SLACKWARE 1" >>confdefs.h
+
 fi
 
 
@@ -26451,11 +26461,14 @@ fi
 # check for pregenerated manpages to be installed
 install_pregen_manpages=no
 if test "$enable_gtk_doc" != "yes" \
+	-a -f man/nmcli.1 \
+	-a -f man/nmtui.1 \
+	-a -f man/nm-online.1 \
 	-a -f man/NetworkManager.conf.5 \
 	-a -f man/nm-settings.5 \
 	-a -f man/nm-settings-keyfile.5 \
 	-a -f man/nm-settings-ifcfg-rh.5 \
-	-a -f man/nmcli-examples.5 \
+	-a -f man/nmcli-examples.7 \
 	-a -f man/NetworkManager.8; then
 	install_pregen_manpages=yes
 fi
@@ -26572,7 +26585,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile shared/Makefile shared/nm-version-macros.h src/Makefile src/tests/Makefile src/tests/config/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/supplicant-manager/tests/certs/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ibft/Makefile src/settings/plugins/ibft/tests/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/Makefile src/devices/tests/Makefile src/devices/adsl/Makefile src/devices/bluetooth/Makefile src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-core/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile clients/Makefile clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile introspection/Makefile introspection/all.xml man/Makefile man/nm-system-settings.conf.5 man/nm-online.1 man/nmcli.1 man/nmtui.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/python/python-networkmanager/Makefile examples/ruby/Makefile examples/lua/Makefile examples/lua/lgi/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile"
+ac_config_files="$ac_config_files Makefile shared/Makefile shared/nm-version-macros.h src/Makefile src/tests/Makefile src/tests/config/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/supplicant-manager/tests/certs/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ibft/Makefile src/settings/plugins/ibft/tests/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/Makefile src/devices/tests/Makefile src/devices/adsl/Makefile src/devices/bluetooth/Makefile src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-core/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile clients/Makefile clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile introspection/Makefile man/Makefile man/common.ent po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/python/python-networkmanager/Makefile examples/ruby/Makefile examples/lua/Makefile examples/lua/lgi/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile"
 
 
 
@@ -27285,7 +27298,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NetworkManager $as_me 1.1.92, which was
+This file was extended by NetworkManager $as_me 1.1.93, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27351,7 +27364,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NetworkManager config.status 1.1.92
+NetworkManager config.status 1.1.93
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -27929,12 +27942,8 @@ do
     "clients/tui/Makefile") CONFIG_FILES="$CONFIG_FILES clients/tui/Makefile" ;;
     "clients/tui/newt/Makefile") CONFIG_FILES="$CONFIG_FILES clients/tui/newt/Makefile" ;;
     "introspection/Makefile") CONFIG_FILES="$CONFIG_FILES introspection/Makefile" ;;
-    "introspection/all.xml") CONFIG_FILES="$CONFIG_FILES introspection/all.xml" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-    "man/nm-system-settings.conf.5") CONFIG_FILES="$CONFIG_FILES man/nm-system-settings.conf.5" ;;
-    "man/nm-online.1") CONFIG_FILES="$CONFIG_FILES man/nm-online.1" ;;
-    "man/nmcli.1") CONFIG_FILES="$CONFIG_FILES man/nmcli.1" ;;
-    "man/nmtui.1") CONFIG_FILES="$CONFIG_FILES man/nmtui.1" ;;
+    "man/common.ent") CONFIG_FILES="$CONFIG_FILES man/common.ent" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "policy/Makefile") CONFIG_FILES="$CONFIG_FILES policy/Makefile" ;;
     "policy/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES policy/org.freedesktop.NetworkManager.policy.in" ;;