Attachment #443464 for bug #588388

Lines 38-43 dnl Link Here

(-)a/configure.ac (+3 lines)
38	AC_PROG_GCC_TRADITIONAL	38	AC_PROG_GCC_TRADITIONAL
39	AC_FUNC_MEMCMP	39	AC_FUNC_MEMCMP
40	AC_CHECK_FUNCS(select socket uname)	40	AC_CHECK_FUNCS(select socket uname)
		41	AC_SEARCH_LIBS([dlopen], [dl dld], [], [
		42	AC_MSG_ERROR([unable to find the dlopen() function])
		43	])
41		44
42	dnl ensure that when the Automake generated makefile calls aclocal,	45	dnl ensure that when the Automake generated makefile calls aclocal,
43	dnl it honours the $ACLOCAL_FLAGS environment variable	46	dnl it honours the $ACLOCAL_FLAGS environment variable




        $(LIBNM_CFLAGS)

libnm_vpn_plugin_openvpn_la_LIBADD = \
        $(LIBNM_LIBS) \
        $(DLOPEN)

libnm_vpn_plugin_openvpn_la_LDFLAGS = \
        -avoid-version \
- 
--
configure.ac                 | 6 +++---
properties/Makefile.am       | 3 ++-
properties/tests/Makefile.am | 1 -
3 files changed, 5 insertions(+), 5 deletions(-)

Lines 38-46 dnl Link Here

(-)a/configure.ac (-3 / +3 lines)
38	AC_PROG_GCC_TRADITIONAL	38	AC_PROG_GCC_TRADITIONAL
39	AC_FUNC_MEMCMP	39	AC_FUNC_MEMCMP
40	AC_CHECK_FUNCS(select socket uname)	40	AC_CHECK_FUNCS(select socket uname)
41	AC_SEARCH_LIBS([dlopen], [dl dld], [], [	41
42	AC_MSG_ERROR([unable to find the dlopen() function])	42	AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
43	])	43	AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
44		44
45	dnl ensure that when the Automake generated makefile calls aclocal,	45	dnl ensure that when the Automake generated makefile calls aclocal,
46	dnl it honours the $ACLOCAL_FLAGS environment variable	46	dnl it honours the $ACLOCAL_FLAGS environment variable

Lines 58-64 libnm_vpn_plugin_openvpn_la_CFLAGS = \ Link Here

(-)a/properties/Makefile.am (-1 / +2 lines)
58		58
59	libnm_vpn_plugin_openvpn_la_LIBADD = \	59	libnm_vpn_plugin_openvpn_la_LIBADD = \
60	$(LIBNM_LIBS) \	60	$(LIBNM_LIBS) \
61	$(DLOPEN)	61	$(DL_LIBS) \
		62	$(NULL)
62		63
63	libnm_vpn_plugin_openvpn_la_LDFLAGS = \	64	libnm_vpn_plugin_openvpn_la_LDFLAGS = \
64	-avoid-version \	65	-avoid-version \

Lines 27-33 test_import_export_LDADD = \ Link Here

(-)a/properties/tests/Makefile.am (-2 lines)
27	$(GTK_LIBS) \	27	$(GTK_LIBS) \
28	$(LIBNM_LIBS) \	28	$(LIBNM_LIBS) \
29	$(LIBNMA_LIBS) \	29	$(LIBNMA_LIBS) \
30	-ldl \
31	$(top_builddir)/properties/libnm-vpn-plugin-openvpn-test.la	30	$(top_builddir)/properties/libnm-vpn-plugin-openvpn-test.la
32		31
33		32
34	-

Return to bug 588388

Lines 57-63 libnm_vpn_plugin_openvpn_la_CFLAGS = \ Link Here

(-)a/properties/Makefile.am (-3 / +2 lines)
57	$(LIBNM_CFLAGS)	57	$(LIBNM_CFLAGS)
58		58
59	libnm_vpn_plugin_openvpn_la_LIBADD = \	59	libnm_vpn_plugin_openvpn_la_LIBADD = \
60	$(LIBNM_LIBS)	60	$(LIBNM_LIBS) \
		61	$(DLOPEN)
61		62
62	libnm_vpn_plugin_openvpn_la_LDFLAGS = \	63	libnm_vpn_plugin_openvpn_la_LDFLAGS = \
63	-avoid-version \	64	-avoid-version \
64	-
65	--
66	configure.ac \| 6 +++---	65	configure.ac \| 6 +++---
67	properties/Makefile.am \| 3 ++-	66	properties/Makefile.am \| 3 ++-
68	properties/tests/Makefile.am \| 1 -	67	properties/tests/Makefile.am \| 1 -
69	3 files changed, 5 insertions(+), 5 deletions(-)	68	3 files changed, 5 insertions(+), 5 deletions(-)