Commit 0c3eb2c0 authored by Michael Biebl's avatar Michael Biebl

Imported Upstream version 1.0.0

parent 90a5a716
......@@ -82,9 +82,9 @@ host_triplet = @host@
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in mkinstalldirs AUTHORS COPYING ChangeLog \
NEWS README compile config.guess config.sub depcomp install-sh \
missing ltmain.sh
$(srcdir)/config.h.in AUTHORS COPYING ChangeLog NEWS README \
compile config.guess config.sub depcomp install-sh missing \
ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
......@@ -95,7 +95,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
......
=======================================================
network-manager-openvpn-1.0
Overview of changes since network-manager-openvpn-0.9.10
=======================================================
This is a new stable release of network-manager-openvpn. Notable changes include:
* Updated translations
* Use Unix socket for management instead of local TCP socket
* Make password requests more robust
* Allow specifying port and protocol for multiple remotes (VPN gateways)
=======================================================
network-manager-openvpn-0.9.10
Overview of changes since network-manager-openvpn-0.9.8
......
......@@ -81,7 +81,7 @@ host_triplet = @host@
libexec_PROGRAMS = nm-openvpn-auth-dialog$(EXEEXT)
subdir = auth-dialog
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
......@@ -90,7 +90,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
......@@ -362,9 +362,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auth-dialog/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu auth-dialog/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign auth-dialog/Makefile
$(AUTOMAKE) --gnu auth-dialog/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -7,7 +7,8 @@ libnm_openvpn_common_la_CPPFLAGS = \
libnm_openvpn_common_la_SOURCES= \
utils.c \
utils.h
utils.h \
nm-glib-compat.h
libnm_openvpn_common_la_LIBADD = \
$(NM_LIBS)
......
......@@ -80,7 +80,7 @@ build_triplet = @build@
host_triplet = @host@
subdir = common
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
......@@ -89,7 +89,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
......@@ -333,7 +333,8 @@ libnm_openvpn_common_la_CPPFLAGS = \
libnm_openvpn_common_la_SOURCES = \
utils.c \
utils.h
utils.h \
nm-glib-compat.h
libnm_openvpn_common_la_LIBADD = \
$(NM_LIBS)
......@@ -351,9 +352,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign common/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign common/Makefile
$(AUTOMAKE) --gnu common/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright 2014 Red Hat, Inc.
*/
#ifndef __NM_GLIB_COMPAT_H__
#define __NM_GLIB_COMPAT_H__
#include <glib.h>
#include <glib-object.h>
#if !GLIB_CHECK_VERSION(2,34,0)
#define g_clear_pointer(pp, destroy) \
G_STMT_START { \
G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
/* Only one access, please */ \
gpointer *_pp = (gpointer *) (pp); \
gpointer _p; \
/* This assignment is needed to avoid a gcc warning */ \
GDestroyNotify _destroy = (GDestroyNotify) (destroy); \
\
(void) (0 ? (gpointer) *(pp) : 0); \
do \
_p = g_atomic_pointer_get (_pp); \
while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
\
if (_p) \
_destroy (_p); \
} G_STMT_END
#endif
#endif /* __NM_GLIB_COMPAT_H__ */
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2005-05-14.22
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -17,8 +17,7 @@ scriptversion=2005-05-14.22
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -29,21 +28,224 @@ scriptversion=2005-05-14.22
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
file=`winepath -w "$file" || echo "$file"`
;;
esac
;;
esac
}
# func_cl_dashL linkdir
# Make cl look for libraries in LINKDIR
func_cl_dashL ()
{
func_file_conv "$1"
if test -z "$lib_path"; then
lib_path=$file
else
lib_path="$lib_path;$file"
fi
linker_opts="$linker_opts -LIBPATH:$file"
}
# func_cl_dashl library
# Do a library search-path lookup for cl
func_cl_dashl ()
{
lib=$1
found=no
save_IFS=$IFS
IFS=';'
for dir in $lib_path $LIB
do
IFS=$save_IFS
if $shared && test -f "$dir/$lib.dll.lib"; then
found=yes
lib=$dir/$lib.dll.lib
break
fi
if test -f "$dir/$lib.lib"; then
found=yes
lib=$dir/$lib.lib
break
fi
if test -f "$dir/lib$lib.a"; then
found=yes
lib=$dir/lib$lib.a
break
fi
done
IFS=$save_IFS
if test "$found" != yes; then
lib=$lib.lib
fi
}
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
lib_path=
shared=:
linker_opts=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
*.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
;;
*)
func_file_conv "$2"
set x "$@" -Fe"$file"
shift
;;
esac
;;
-I)
eat=1
func_file_conv "$2" mingw
set x "$@" -I"$file"
shift
;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
-l)
eat=1
func_cl_dashl "$2"
set x "$@" "$lib"
shift
;;
-l*)
func_cl_dashl "${1#-l}"
set x "$@" "$lib"
shift
;;
-L)
eat=1
func_cl_dashL "$2"
;;
-L*)
func_cl_dashL "${1#-L}"
;;
-static)
shared=false
;;
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','
for flag in $arg; do
IFS="$save_ifs"
linker_opts="$linker_opts $flag"
done
IFS="$save_ifs"
;;
-Xlinker)
eat=1
linker_opts="$linker_opts $2"
;;
-*)
set x "$@" "$1"
shift
;;
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
func_file_conv "$1"
set x "$@" -Tp"$file"
shift
;;
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
func_file_conv "$1" mingw
set x "$@" "$file"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -n "$linker_opts"; then
linker_opts="-link$linker_opts"
fi
exec "$@" $linker_opts
exit 1
}
eat=
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
Wrapper for compilers which do not understand '-c -o'.
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.
right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
......@@ -53,11 +255,13 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
ofile=
cfile=
eat=
for arg
do
......@@ -66,8 +270,8 @@ do
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object.
# configure might choose to run compile as 'compile cc -o foo foo.c'.
# So we strip '-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
......@@ -94,22 +298,22 @@ do
done
if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a
# If no '-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# '.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
......@@ -124,9 +328,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
mv "${cofile}bj" "$ofile"
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
......@@ -138,5 +342,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
This diff is collapsed.
This diff is collapsed.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for NetworkManager-openvpn 0.9.10.0.
# Generated by GNU Autoconf 2.69 for NetworkManager-openvpn 1.0.0.
#
# Report bugs to <dcbw@redhat.com>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='NetworkManager-openvpn'
PACKAGE_TARNAME='NetworkManager-openvpn'
PACKAGE_VERSION='0.9.10.0'
PACKAGE_STRING='NetworkManager-openvpn 0.9.10.0'
PACKAGE_VERSION='1.0.0'
PACKAGE_STRING='NetworkManager-openvpn 1.0.0'
PACKAGE_BUGREPORT='dcbw@redhat.com'
PACKAGE_URL=''
......@@ -1402,7 +1402,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-openvpn 0.9.10.0 to adapt to many kinds of systems.
\`configure' configures NetworkManager-openvpn 1.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1473,7 +1473,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of NetworkManager-openvpn 0.9.10.0:";;
short | recursive ) echo "Configuration of NetworkManager-openvpn 1.0.0:";;
esac
cat <<\_ACEOF
......@@ -1609,7 +1609,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
NetworkManager-openvpn configure 0.9.10.0
NetworkManager-openvpn configure 1.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2032,7 +2032,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-openvpn $as_me 0.9.10.0, which was
It was created by NetworkManager-openvpn $as_me 1.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2895,7 +2895,7 @@ fi
# Define the identity of the package.
PACKAGE='NetworkManager-openvpn'
VERSION='0.9.10.0'
VERSION='1.0.0'
cat >>confdefs.h <<_ACEOF
......@@ -13727,21 +13727,21 @@ if test -n "$NM_CFLAGS"; then
pkg_cv_NM_CFLAGS="$NM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NM_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9" 2>/dev/null`
pkg_cv_NM_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
......@@ -13753,21 +13753,21 @@ if test -n "$NM_LIBS"; then
pkg_cv_NM_LIBS="$NM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NM_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9" 2>/dev/null`
pkg_cv_NM_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
......@@ -13788,23 +13788,23 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9" 2>&1`
NM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10" 2>&1`
else
NM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9" 2>&1`
NM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NM_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9) were not met:
as_fn_error $? "Package requirements (NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10) were not met:
$NM_PKG_ERRORS
......@@ -13945,12 +13945,12 @@ if test -n "$NMGTK_CFLAGS"; then
pkg_cv_NMGTK_CFLAGS="$NMGTK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-gtk >= 0.9.9.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libnm-gtk >= 0.9.9.0") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-gtk >= 0.9.10\""; } >&5
($PKG_CONFIG --exists --print-errors "libnm-gtk >= 0.9.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NMGTK_CFLAGS=`$PKG_CONFIG --cflags "libnm-gtk >= 0.9.9.0" 2>/dev/null`
pkg_cv_NMGTK_CFLAGS=`$PKG_CONFIG --cflags "libnm-gtk >= 0.9.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
......@@ -13962,12 +13962,12 @@ if test -n "$NMGTK_LIBS"; then
pkg_cv_NMGTK_LIBS="$NMGTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-gtk >= 0.9.9.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libnm-gtk >= 0.9.9.0") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-gtk >= 0.9.10\""; } >&5
($PKG_CONFIG --exists --print-errors "libnm-gtk >= 0.9.10") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NMGTK_LIBS=`$PKG_CONFIG --libs "libnm-gtk >= 0.9.9.0" 2>/dev/null`
pkg_cv_NMGTK_LIBS=`$PKG_CONFIG --libs "libnm-gtk >= 0.9.10" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
......@@ -13988,14 +13988,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
NMGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm-gtk >= 0.9.9.0" 2>&1`
NMGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm-gtk >= 0.9.10" 2>&1`
else
NMGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm-gtk >= 0.9.9.0" 2>&1`
NMGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm-gtk >= 0.9.10" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NMGTK_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (libnm-gtk >= 0.9.9.0) were not met:
as_fn_error $? "Package requirements (libnm-gtk >= 0.9.10) were not met:
$NMGTK_PKG_ERRORS
......@@ -14776,7 +14776,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-openvpn $as_me 0.9.10.0, which was
This file was extended by NetworkManager-openvpn $as_me 1.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -14842,7 +14842,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-openvpn config.status 0.9.10.0
NetworkManager-openvpn config.status 1.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
AC_PREREQ(2.52)
AC_INIT(NetworkManager-openvpn, 0.9.10.0, dcbw@redhat.com, NetworkManager-openvpn)
AC_INIT(NetworkManager-openvpn, 1.0.0, dcbw@redhat.com, NetworkManager-openvpn)
AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE
......@@ -67,10 +67,10 @@ AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
PKG_CHECK_MODULES(NM,
NetworkManager >= 0.9.9
libnm-util >= 0.9.9
libnm-glib >= 0.9.9
libnm-glib-vpn >= 0.9.9)
NetworkManager >= 0.9.10
libnm-util >= 0.9.10
libnm-glib >= 0.9.10
libnm-glib-vpn >= 0.9.10)
NM_CFLAGS="$NM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10"
AC_SUBST(NM_CFLAGS)
AC_SUBST(NM_LIBS)
......@@ -81,7 +81,7 @@ if test x"$with_gnome" != xno; then
AC_SUBST(GTK_LIBS)
GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.9.0)
PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.10)
AC_SUBST(NMGTK_CFLAGS)
AC_SUBST(NMGTK_LIBS)
......