Hello community,
here is the log from the commit of package NetworkManager-strongswan for
openSUSE:Factory checked in at 2018-03-14 19:37:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-strongswan (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-strongswan"
Wed Mar 14 19:37:10 2018 rev:18 rq:584805 version:1.4.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-strongswan/NetworkManager-strongswan.changes
2018-03-09 10:41:39.209358921 +0100
+++
/work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new/NetworkManager-strongswan.changes
2018-03-14 19:37:12.217111197 +0100
@@ -1,0 +2,6 @@
+Wed Mar 7 20:06:29 UTC 2018 - [email protected]
+
+- Update to version 1.4.3:
+ + Add option to disable libnm-glib compatibility.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-strongswan-1.4.2.tar.bz2
New:
----
NetworkManager-strongswan-1.4.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-strongswan.spec ++++++
--- /var/tmp/diff_new_pack.4OqL9r/_old 2018-03-14 19:37:13.125078947 +0100
+++ /var/tmp/diff_new_pack.4OqL9r/_new 2018-03-14 19:37:13.133078663 +0100
@@ -17,7 +17,7 @@
Name: NetworkManager-strongswan
-Version: 1.4.2
+Version: 1.4.3
Release: 0
Summary: NetworkManager VPN support for strongSwan
License: GPL-2.0-or-later
++++++ NetworkManager-strongswan-1.4.2.tar.bz2 ->
NetworkManager-strongswan-1.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.2/Makefile.am
new/NetworkManager-strongswan-1.4.3/Makefile.am
--- old/NetworkManager-strongswan-1.4.2/Makefile.am 2016-10-21
09:44:33.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.3/Makefile.am 2018-02-19
12:10:11.000000000 +0100
@@ -12,6 +12,7 @@
appdata_in_files = NetworkManager-strongswan.appdata.xml.in
@INTLTOOL_XML_RULE@
+if WITH_LIBNM_GLIB
# Install a file with full path to plugins for an old gnome-shell
# https://bugzilla.gnome.org/show_bug.cgi?id=693590
install-data-hook:
@@ -26,6 +27,7 @@
uninstall-hook:
rm -f
$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name
+endif
nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
$(AM_V_GEN) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.2/Makefile.in
new/NetworkManager-strongswan-1.4.3/Makefile.in
--- old/NetworkManager-strongswan-1.4.2/Makefile.in 2017-05-30
14:42:21.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.3/Makefile.in 2018-02-19
14:45:51.000000000 +0100
@@ -856,6 +856,8 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+@WITH_LIBNM_GLIB_FALSE@install-data-hook:
+@WITH_LIBNM_GLIB_FALSE@uninstall-hook:
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@@ -958,18 +960,18 @@
# Install a file with full path to plugins for an old gnome-shell
# https://bugzilla.gnome.org/show_bug.cgi?id=693590
-install-data-hook:
- mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
- sed -e "1s|^|# This file is obsoleted by a file in
$(nmvpnservicedir)\n\n|" \
- -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|g' \
- -e 's|[@]NM_PLUGINDIR[@]|$(nm_plugindir)|g' \
- -e 's|[@]NM_PLUGINDIR_ABS[@]|$(nm_plugindir)|g' \
- -e 's|[@]CHARON[@]|$(charon)|' \
- <$(srcdir)/nm-strongswan-service.name.in \
-
>$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name
+@WITH_LIBNM_GLIB_TRUE@install-data-hook:
+@WITH_LIBNM_GLIB_TRUE@ mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
+@WITH_LIBNM_GLIB_TRUE@ sed -e "1s|^|# This file is obsoleted by a file in
$(nmvpnservicedir)\n\n|" \
+@WITH_LIBNM_GLIB_TRUE@ -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|g' \
+@WITH_LIBNM_GLIB_TRUE@ -e 's|[@]NM_PLUGINDIR[@]|$(nm_plugindir)|g' \
+@WITH_LIBNM_GLIB_TRUE@ -e 's|[@]NM_PLUGINDIR_ABS[@]|$(nm_plugindir)|g' \
+@WITH_LIBNM_GLIB_TRUE@ -e 's|[@]CHARON[@]|$(charon)|' \
+@WITH_LIBNM_GLIB_TRUE@ <$(srcdir)/nm-strongswan-service.name.in \
+@WITH_LIBNM_GLIB_TRUE@
>$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name
-uninstall-hook:
- rm -f
$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name
+@WITH_LIBNM_GLIB_TRUE@uninstall-hook:
+@WITH_LIBNM_GLIB_TRUE@ rm -f
$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name
nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
$(AM_V_GEN) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.2/NEWS
new/NetworkManager-strongswan-1.4.3/NEWS
--- old/NetworkManager-strongswan-1.4.2/NEWS 2017-05-30 14:41:41.000000000
+0200
+++ new/NetworkManager-strongswan-1.4.3/NEWS 2018-02-19 14:45:13.000000000
+0100
@@ -1,3 +1,8 @@
+NetworkManager-strongswan-1.4.3
+-------------------------------
+
+- Add option to disable libnm-glib compatibility
+
NetworkManager-strongswan-1.4.2
-------------------------------
@@ -27,7 +32,7 @@
-------------------------------
- Add PSK support
-- Updated german translations
+- Updated German translations
NetworkManager-strongswan-1.3.0
-------------------------------
@@ -44,7 +49,7 @@
- Additionally look for libnm-glib[-vpn] pkgconfig packages during configure
- Tooltips are translatable
-- Update german translations
+- Update German translations
NetworkManager-strongswan-1.1.1
-------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.2/configure
new/NetworkManager-strongswan-1.4.3/configure
--- old/NetworkManager-strongswan-1.4.2/configure 2017-05-30
14:42:19.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.3/configure 2018-02-19
14:45:50.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NetworkManager-strongswan 1.4.2.
+# Generated by GNU Autoconf 2.69 for NetworkManager-strongswan 1.4.3.
#
# Report bugs to <[email protected]>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='NetworkManager-strongswan'
PACKAGE_TARNAME='NetworkManager-strongswan'
-PACKAGE_VERSION='1.4.2'
-PACKAGE_STRING='NetworkManager-strongswan 1.4.2'
+PACKAGE_VERSION='1.4.3'
+PACKAGE_STRING='NetworkManager-strongswan 1.4.3'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''
@@ -637,15 +637,17 @@
nm_plugindir_abs
nm_plugindir
nm_libexecdir
-charon
-LIBNM_LIBS
-LIBNM_CFLAGS
-LIBNMA_LIBS
-LIBNMA_CFLAGS
LIBNM_GTK_LIBS
LIBNM_GTK_CFLAGS
LIBNM_GLIB_LIBS
LIBNM_GLIB_CFLAGS
+LIBNMA_LIBS
+LIBNMA_CFLAGS
+LIBNM_LIBS
+LIBNM_CFLAGS
+WITH_LIBNM_GLIB_FALSE
+WITH_LIBNM_GLIB_TRUE
+charon
LIBSECRET_LIBS
LIBSECRET_CFLAGS
GTK_LIBS
@@ -836,6 +838,7 @@
enable_nls
with_charon
enable_nm_absolute_paths
+with_libnm_glib
enable_more_warnings
'
ac_precious_vars='build_alias
@@ -855,14 +858,14 @@
GTK_LIBS
LIBSECRET_CFLAGS
LIBSECRET_LIBS
+LIBNM_CFLAGS
+LIBNM_LIBS
+LIBNMA_CFLAGS
+LIBNMA_LIBS
LIBNM_GLIB_CFLAGS
LIBNM_GLIB_LIBS
LIBNM_GTK_CFLAGS
-LIBNM_GTK_LIBS
-LIBNMA_CFLAGS
-LIBNMA_LIBS
-LIBNM_CFLAGS
-LIBNM_LIBS'
+LIBNM_GTK_LIBS'
# Initialize some variables set by options.
@@ -1413,7 +1416,7 @@
# 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-strongswan 1.4.2 to adapt to many kinds
of systems.
+\`configure' configures NetworkManager-strongswan 1.4.3 to adapt to many kinds
of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1485,7 +1488,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager-strongswan
1.4.2:";;
+ short | recursive ) echo "Configuration of NetworkManager-strongswan
1.4.3:";;
esac
cat <<\_ACEOF
@@ -1526,6 +1529,8 @@
compiler's sysroot if not specified).
--with-charon=file path to the strongSwan charon NetworkManager
backend"
+ --without-libnm-glib Build NetworkManager-strongswan without libnm-glib
+ comatibility
Some influential environment variables:
CC C compiler command
@@ -1549,6 +1554,12 @@
C compiler flags for LIBSECRET, overriding pkg-config
LIBSECRET_LIBS
linker flags for LIBSECRET, overriding pkg-config
+ LIBNM_CFLAGS
+ C compiler flags for LIBNM, overriding pkg-config
+ LIBNM_LIBS linker flags for LIBNM, overriding pkg-config
+ LIBNMA_CFLAGS
+ C compiler flags for LIBNMA, overriding pkg-config
+ LIBNMA_LIBS linker flags for LIBNMA, overriding pkg-config
LIBNM_GLIB_CFLAGS
C compiler flags for LIBNM_GLIB, overriding pkg-config
LIBNM_GLIB_LIBS
@@ -1557,12 +1568,6 @@
C compiler flags for LIBNM_GTK, overriding pkg-config
LIBNM_GTK_LIBS
linker flags for LIBNM_GTK, overriding pkg-config
- LIBNMA_CFLAGS
- C compiler flags for LIBNMA, overriding pkg-config
- LIBNMA_LIBS linker flags for LIBNMA, overriding pkg-config
- LIBNM_CFLAGS
- C compiler flags for LIBNM, overriding pkg-config
- LIBNM_LIBS linker flags for LIBNM, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1630,7 +1635,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-NetworkManager-strongswan configure 1.4.2
+NetworkManager-strongswan configure 1.4.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2053,7 +2058,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by NetworkManager-strongswan $as_me 1.4.2, which was
+It was created by NetworkManager-strongswan $as_me 1.4.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2916,7 +2921,7 @@
# Define the identity of the package.
PACKAGE='NetworkManager-strongswan'
- VERSION='1.4.2'
+ VERSION='1.4.3'
cat >>confdefs.h <<_ACEOF
@@ -14027,20 +14032,55 @@
fi
+# Check whether --with-charon was given.
+if test "${with_charon+set}" = set; then :
+ withval=$with_charon; charon="$withval"
+
+else
+ charon="${libexecdir}/ipsec/charon-nm"
+
+
+fi
+
+# Check whether --enable-nm-absolute-paths was given.
+if test "${enable_nm_absolute_paths+set}" = set; then :
+ enableval=$enable_nm_absolute_paths;
+fi
+
+
+# Check whether --with-libnm-glib was given.
+if test "${with_libnm_glib+set}" = set; then :
+ withval=$with_libnm_glib; with_libnm_glib=no
+else
+ with_libnm_glib=yes
+
+fi
+
+
+ if test "$with_libnm_glib" != no; then
+ WITH_LIBNM_GLIB_TRUE=
+ WITH_LIBNM_GLIB_FALSE='#'
+else
+ WITH_LIBNM_GLIB_TRUE='#'
+ WITH_LIBNM_GLIB_FALSE=
+fi
+
+
+
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNM_GLIB" >&5
-$as_echo_n "checking for LIBNM_GLIB... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNM" >&5
+$as_echo_n "checking for LIBNM... " >&6; }
-if test -n "$LIBNM_GLIB_CFLAGS"; then
- pkg_cv_LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS"
+if test -n "$LIBNM_CFLAGS"; then
+ pkg_cv_LIBNM_CFLAGS="$LIBNM_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 >= 1.1.0 libnm-util libnm-glib
libnm-glib-vpn\""; } >&5
- ($PKG_CONFIG --exists --print-errors "NetworkManager >= 1.1.0 libnm-util
libnm-glib libnm-glib-vpn") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnm >= 1.1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnm >= 1.1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBNM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 1.1.0
libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null`
+ pkg_cv_LIBNM_CFLAGS=`$PKG_CONFIG --cflags "libnm >= 1.1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14048,16 +14088,16 @@
else
pkg_failed=untried
fi
-if test -n "$LIBNM_GLIB_LIBS"; then
- pkg_cv_LIBNM_GLIB_LIBS="$LIBNM_GLIB_LIBS"
+if test -n "$LIBNM_LIBS"; then
+ pkg_cv_LIBNM_LIBS="$LIBNM_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 >= 1.1.0 libnm-util libnm-glib
libnm-glib-vpn\""; } >&5
- ($PKG_CONFIG --exists --print-errors "NetworkManager >= 1.1.0 libnm-util
libnm-glib libnm-glib-vpn") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnm >= 1.1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnm >= 1.1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBNM_GLIB_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 1.1.0
libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null`
+ pkg_cv_LIBNM_LIBS=`$PKG_CONFIG --libs "libnm >= 1.1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14078,22 +14118,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBNM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "NetworkManager >= 1.1.0 libnm-util libnm-glib
libnm-glib-vpn" 2>&1`
+ LIBNM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnm >= 1.1.0" 2>&1`
else
- LIBNM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "NetworkManager >= 1.1.0 libnm-util libnm-glib libnm-glib-vpn" 2>&1`
+ LIBNM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libnm >= 1.1.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBNM_GLIB_PKG_ERRORS" >&5
+ echo "$LIBNM_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (NetworkManager >= 1.1.0
libnm-util libnm-glib libnm-glib-vpn) were not met:
+ as_fn_error $? "Package requirements (libnm >= 1.1.0) were not met:
-$LIBNM_GLIB_PKG_ERRORS
+$LIBNM_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables LIBNM_GLIB_CFLAGS
-and LIBNM_GLIB_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBNM_CFLAGS
+and LIBNM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -14104,34 +14144,36 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables LIBNM_GLIB_CFLAGS
-and LIBNM_GLIB_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBNM_CFLAGS
+and LIBNM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBNM_GLIB_CFLAGS=$pkg_cv_LIBNM_GLIB_CFLAGS
- LIBNM_GLIB_LIBS=$pkg_cv_LIBNM_GLIB_LIBS
+ LIBNM_CFLAGS=$pkg_cv_LIBNM_CFLAGS
+ LIBNM_LIBS=$pkg_cv_LIBNM_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNM_GTK" >&5
-$as_echo_n "checking for LIBNM_GTK... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNMA" >&5
+$as_echo_n "checking for LIBNMA... " >&6; }
-if test -n "$LIBNM_GTK_CFLAGS"; then
- pkg_cv_LIBNM_GTK_CFLAGS="$LIBNM_GTK_CFLAGS"
+if test -n "$LIBNMA_CFLAGS"; then
+ pkg_cv_LIBNMA_CFLAGS="$LIBNMA_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 >= 1.1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnm-gtk >= 1.1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnma >= 1.1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnma >= 1.1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBNM_GTK_CFLAGS=`$PKG_CONFIG --cflags "libnm-gtk >= 1.1.0"
2>/dev/null`
+ pkg_cv_LIBNMA_CFLAGS=`$PKG_CONFIG --cflags "libnma >= 1.1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14139,16 +14181,16 @@
else
pkg_failed=untried
fi
-if test -n "$LIBNM_GTK_LIBS"; then
- pkg_cv_LIBNM_GTK_LIBS="$LIBNM_GTK_LIBS"
+if test -n "$LIBNMA_LIBS"; then
+ pkg_cv_LIBNMA_LIBS="$LIBNMA_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 >= 1.1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnm-gtk >= 1.1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnma >= 1.1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnma >= 1.1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBNM_GTK_LIBS=`$PKG_CONFIG --libs "libnm-gtk >= 1.1.0" 2>/dev/null`
+ pkg_cv_LIBNMA_LIBS=`$PKG_CONFIG --libs "libnma >= 1.1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14169,22 +14211,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBNM_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnm-gtk >= 1.1.0" 2>&1`
+ LIBNMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnma >= 1.1.0" 2>&1`
else
- LIBNM_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "libnm-gtk >= 1.1.0" 2>&1`
+ LIBNMA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libnma >= 1.1.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBNM_GTK_PKG_ERRORS" >&5
+ echo "$LIBNMA_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libnm-gtk >= 1.1.0) were not met:
+ as_fn_error $? "Package requirements (libnma >= 1.1.0) were not met:
-$LIBNM_GTK_PKG_ERRORS
+$LIBNMA_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables LIBNM_GTK_CFLAGS
-and LIBNM_GTK_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBNMA_CFLAGS
+and LIBNMA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -14195,34 +14237,36 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables LIBNM_GTK_CFLAGS
-and LIBNM_GTK_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBNMA_CFLAGS
+and LIBNMA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBNM_GTK_CFLAGS=$pkg_cv_LIBNM_GTK_CFLAGS
- LIBNM_GTK_LIBS=$pkg_cv_LIBNM_GTK_LIBS
+ LIBNMA_CFLAGS=$pkg_cv_LIBNMA_CFLAGS
+ LIBNMA_LIBS=$pkg_cv_LIBNMA_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
+if test x"$with_libnm_glib" != xno; then
+
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNMA" >&5
-$as_echo_n "checking for LIBNMA... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNM_GLIB" >&5
+$as_echo_n "checking for LIBNM_GLIB... " >&6; }
-if test -n "$LIBNMA_CFLAGS"; then
- pkg_cv_LIBNMA_CFLAGS="$LIBNMA_CFLAGS"
+if test -n "$LIBNM_GLIB_CFLAGS"; then
+ pkg_cv_LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnma >= 1.1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnma >= 1.1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"NetworkManager >= 1.1.0 libnm-util libnm-glib
libnm-glib-vpn\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "NetworkManager >= 1.1.0 libnm-util
libnm-glib libnm-glib-vpn") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBNMA_CFLAGS=`$PKG_CONFIG --cflags "libnma >= 1.1.0" 2>/dev/null`
+ pkg_cv_LIBNM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 1.1.0
libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14230,16 +14274,16 @@
else
pkg_failed=untried
fi
-if test -n "$LIBNMA_LIBS"; then
- pkg_cv_LIBNMA_LIBS="$LIBNMA_LIBS"
+if test -n "$LIBNM_GLIB_LIBS"; then
+ pkg_cv_LIBNM_GLIB_LIBS="$LIBNM_GLIB_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnma >= 1.1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnma >= 1.1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"NetworkManager >= 1.1.0 libnm-util libnm-glib
libnm-glib-vpn\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "NetworkManager >= 1.1.0 libnm-util
libnm-glib libnm-glib-vpn") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBNMA_LIBS=`$PKG_CONFIG --libs "libnma >= 1.1.0" 2>/dev/null`
+ pkg_cv_LIBNM_GLIB_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 1.1.0
libnm-util libnm-glib libnm-glib-vpn" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14260,22 +14304,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBNMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnma >= 1.1.0" 2>&1`
+ LIBNM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "NetworkManager >= 1.1.0 libnm-util libnm-glib
libnm-glib-vpn" 2>&1`
else
- LIBNMA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libnma >= 1.1.0" 2>&1`
+ LIBNM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "NetworkManager >= 1.1.0 libnm-util libnm-glib libnm-glib-vpn" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBNMA_PKG_ERRORS" >&5
+ echo "$LIBNM_GLIB_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libnma >= 1.1.0) were not met:
+ as_fn_error $? "Package requirements (NetworkManager >= 1.1.0
libnm-util libnm-glib libnm-glib-vpn) were not met:
-$LIBNMA_PKG_ERRORS
+$LIBNM_GLIB_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables LIBNMA_CFLAGS
-and LIBNMA_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBNM_GLIB_CFLAGS
+and LIBNM_GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -14286,35 +14330,34 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables LIBNMA_CFLAGS
-and LIBNMA_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBNM_GLIB_CFLAGS
+and LIBNM_GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBNMA_CFLAGS=$pkg_cv_LIBNMA_CFLAGS
- LIBNMA_LIBS=$pkg_cv_LIBNMA_LIBS
+ LIBNM_GLIB_CFLAGS=$pkg_cv_LIBNM_GLIB_CFLAGS
+ LIBNM_GLIB_LIBS=$pkg_cv_LIBNM_GLIB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
-
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNM" >&5
-$as_echo_n "checking for LIBNM... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNM_GTK" >&5
+$as_echo_n "checking for LIBNM_GTK... " >&6; }
-if test -n "$LIBNM_CFLAGS"; then
- pkg_cv_LIBNM_CFLAGS="$LIBNM_CFLAGS"
+if test -n "$LIBNM_GTK_CFLAGS"; then
+ pkg_cv_LIBNM_GTK_CFLAGS="$LIBNM_GTK_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 >= 1.1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnm >= 1.1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnm-gtk >= 1.1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnm-gtk >= 1.1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBNM_CFLAGS=`$PKG_CONFIG --cflags "libnm >= 1.1.0" 2>/dev/null`
+ pkg_cv_LIBNM_GTK_CFLAGS=`$PKG_CONFIG --cflags "libnm-gtk >= 1.1.0"
2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14322,16 +14365,16 @@
else
pkg_failed=untried
fi
-if test -n "$LIBNM_LIBS"; then
- pkg_cv_LIBNM_LIBS="$LIBNM_LIBS"
+if test -n "$LIBNM_GTK_LIBS"; then
+ pkg_cv_LIBNM_GTK_LIBS="$LIBNM_GTK_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 >= 1.1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnm >= 1.1.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnm-gtk >= 1.1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnm-gtk >= 1.1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBNM_LIBS=`$PKG_CONFIG --libs "libnm >= 1.1.0" 2>/dev/null`
+ pkg_cv_LIBNM_GTK_LIBS=`$PKG_CONFIG --libs "libnm-gtk >= 1.1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -14352,22 +14395,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBNM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnm >= 1.1.0" 2>&1`
+ LIBNM_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnm-gtk >= 1.1.0" 2>&1`
else
- LIBNM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libnm >= 1.1.0" 2>&1`
+ LIBNM_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "libnm-gtk >= 1.1.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBNM_PKG_ERRORS" >&5
+ echo "$LIBNM_GTK_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libnm >= 1.1.0) were not met:
+ as_fn_error $? "Package requirements (libnm-gtk >= 1.1.0) were not met:
-$LIBNM_PKG_ERRORS
+$LIBNM_GTK_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables LIBNM_CFLAGS
-and LIBNM_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBNM_GTK_CFLAGS
+and LIBNM_GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -14378,39 +14421,21 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables LIBNM_CFLAGS
-and LIBNM_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBNM_GTK_CFLAGS
+and LIBNM_GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBNM_CFLAGS=$pkg_cv_LIBNM_CFLAGS
- LIBNM_LIBS=$pkg_cv_LIBNM_LIBS
+ LIBNM_GTK_CFLAGS=$pkg_cv_LIBNM_GTK_CFLAGS
+ LIBNM_GTK_LIBS=$pkg_cv_LIBNM_GTK_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
-
-
-# Check whether --with-charon was given.
-if test "${with_charon+set}" = set; then :
- withval=$with_charon; charon="$withval"
-
-else
- charon="${libexecdir}/ipsec/charon-nm"
-
-
fi
-# Check whether --enable-nm-absolute-paths was given.
-if test "${enable_nm_absolute_paths+set}" = set; then :
- enableval=$enable_nm_absolute_paths;
-fi
-
-
nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager)
nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager)
@@ -14615,6 +14640,10 @@
ac_config_commands="$ac_config_commands po/stamp-it"
+if test -z "${WITH_LIBNM_GLIB_TRUE}" && test -z "${WITH_LIBNM_GLIB_FALSE}";
then
+ as_fn_error $? "conditional \"WITH_LIBNM_GLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -15012,7 +15041,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by NetworkManager-strongswan $as_me 1.4.2, which was
+This file was extended by NetworkManager-strongswan $as_me 1.4.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15078,7 +15107,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-NetworkManager-strongswan config.status 1.4.2
+NetworkManager-strongswan config.status 1.4.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NetworkManager-strongswan-1.4.2/configure.ac
new/NetworkManager-strongswan-1.4.3/configure.ac
--- old/NetworkManager-strongswan-1.4.2/configure.ac 2017-05-30
14:41:41.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.3/configure.ac 2018-02-19
14:44:01.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(NetworkManager-strongswan, 1.4.2, [email protected],
NetworkManager-strongswan)
+AC_INIT(NetworkManager-strongswan, 1.4.3, [email protected],
NetworkManager-strongswan)
AM_INIT_AUTOMAKE([subdir-objects])
AM_MAINTAINER_MODE
@@ -46,14 +46,6 @@
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
-PKG_CHECK_MODULES(LIBNM_GLIB, NetworkManager >= 1.1.0 libnm-util libnm-glib
libnm-glib-vpn)
-PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.1.0)
-PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
-
-PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0)
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
-
AC_ARG_WITH(
[charon],
AS_HELP_STRING([--with-charon=file],[path to the strongSwan charon
NetworkManager backend"]),
@@ -64,6 +56,24 @@
[nm-absolute-paths],
AS_HELP_STRING([--enable-nm-absolute-paths],[use absolute paths for NM
plugins in the .name file])
)
+AC_ARG_WITH(
+ [libnm-glib],
+ AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-strongswan
without libnm-glib comatibility]),
+ [with_libnm_glib=no],
+ [with_libnm_glib=yes]
+)
+
+AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
+
+PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0)
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
+PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
+
+if test x"$with_libnm_glib" != xno; then
+ PKG_CHECK_MODULES(LIBNM_GLIB, NetworkManager >= 1.1.0 libnm-util
libnm-glib libnm-glib-vpn)
+ PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.1.0)
+fi
nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager)
AC_SUBST(nm_libexecdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/NetworkManager-strongswan-1.4.2/properties/Makefile.am
new/NetworkManager-strongswan-1.4.3/properties/Makefile.am
--- old/NetworkManager-strongswan-1.4.2/properties/Makefile.am 2016-10-21
09:44:33.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.3/properties/Makefile.am 2018-02-19
12:10:11.000000000 +0100
@@ -1,5 +1,8 @@
nm_plugin_LTLIBRARIES = libnm-vpn-plugin-strongswan.la
+
+if WITH_LIBNM_GLIB
nm_plugin_LTLIBRARIES += libnm-strongswan-properties.la
+endif
libnm_vpn_plugin_strongswan_la_SOURCES = \
nm-strongswan.c \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/NetworkManager-strongswan-1.4.2/properties/Makefile.in
new/NetworkManager-strongswan-1.4.3/properties/Makefile.in
--- old/NetworkManager-strongswan-1.4.2/properties/Makefile.in 2017-05-30
14:42:21.000000000 +0200
+++ new/NetworkManager-strongswan-1.4.3/properties/Makefile.in 2018-02-19
14:45:51.000000000 +0100
@@ -89,6 +89,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@WITH_LIBNM_GLIB_TRUE@am__append_1 = libnm-strongswan-properties.la
subdir = properties
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
@@ -147,6 +148,8 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(libnm_strongswan_properties_la_CFLAGS) $(CFLAGS) \
$(libnm_strongswan_properties_la_LDFLAGS) $(LDFLAGS) -o $@
+@WITH_LIBNM_GLIB_TRUE@am_libnm_strongswan_properties_la_rpath = \
+@WITH_LIBNM_GLIB_TRUE@ -rpath $(nm_plugindir)
libnm_vpn_plugin_strongswan_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libnm_vpn_plugin_strongswan_la_OBJECTS = \
@@ -387,8 +390,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-nm_plugin_LTLIBRARIES = libnm-vpn-plugin-strongswan.la \
- libnm-strongswan-properties.la
+nm_plugin_LTLIBRARIES = libnm-vpn-plugin-strongswan.la $(am__append_1)
libnm_vpn_plugin_strongswan_la_SOURCES = \
nm-strongswan.c \
nm-strongswan.h
@@ -502,7 +504,7 @@
}
libnm-strongswan-properties.la: $(libnm_strongswan_properties_la_OBJECTS)
$(libnm_strongswan_properties_la_DEPENDENCIES)
$(EXTRA_libnm_strongswan_properties_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libnm_strongswan_properties_la_LINK) -rpath
$(nm_plugindir) $(libnm_strongswan_properties_la_OBJECTS)
$(libnm_strongswan_properties_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(libnm_strongswan_properties_la_LINK)
$(am_libnm_strongswan_properties_la_rpath)
$(libnm_strongswan_properties_la_OBJECTS)
$(libnm_strongswan_properties_la_LIBADD) $(LIBS)
libnm-vpn-plugin-strongswan.la: $(libnm_vpn_plugin_strongswan_la_OBJECTS)
$(libnm_vpn_plugin_strongswan_la_DEPENDENCIES)
$(EXTRA_libnm_vpn_plugin_strongswan_la_DEPENDENCIES)
$(AM_V_CCLD)$(libnm_vpn_plugin_strongswan_la_LINK) -rpath
$(nm_plugindir) $(libnm_vpn_plugin_strongswan_la_OBJECTS)
$(libnm_vpn_plugin_strongswan_la_LIBADD) $(LIBS)
