Attachment #97902 for bug #148856

View | Details | Raw Unified | Return to bug 148856
Collapse All | Expand All

Lines 199-204 Link Here

(-)src/Makefile.am.org (+2 lines)
199		199
200	libgaim_client_la_SOURCES = gaim-client.c gaim-client.h	200	libgaim_client_la_SOURCES = gaim-client.c gaim-client.h
201		201
		202	libgaim_client_la_LIBADD = $(DBUS_LIBS)
		203
202	gaim-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)	204	gaim-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
203	cat $(dbus_build_exported) \| $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@	205	cat $(dbus_build_exported) \| $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
204		206




	if test "x$with_gnutls_libs"     != "xno" -a \
	        "x$have_gnutls_includes" != "xno"; then

		LIBS_save="$LIBS"

		case $with_gnutls_libs in
			""|-L*) ;;


		AC_CACHE_CHECK([for GNUTLS libraries], gnutls_libs,
		[
			LIBS="$LIBS $with_gnutls_libs -lgnutls -lgcrypt"
			AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no")
			LIBS="$LIBS_save"
		])

		if test "x$gnutls_libs" != "xno"; then

			AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
			[
				LIBS_save=$LIBS
				LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs"
				LIBS="$nsslibs $nsprlibs"

				AC_TRY_LINK_FUNC(NSS_Init,


				if test "x$moz_nss_libs" = "xno"; then
					nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
					LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs" 
					LIBS="$LIBS $nsslibs"
					AC_TRY_LINK_FUNC(NSS_Init,
						[moz_nss_libs="yes"],
						[moz_nss_libs="no"])

Return to bug 148856

Lines 1092-1098 Link Here

(-)configure.ac.org (-5 / +6 lines)
1092	if test "x$with_gnutls_libs" != "xno" -a \	1092	if test "x$with_gnutls_libs" != "xno" -a \
1093	"x$have_gnutls_includes" != "xno"; then	1093	"x$have_gnutls_includes" != "xno"; then
1094		1094
1095	LDFLAGS_save="$LDFLAGS"	1095	LIBS_save="$LIBS"
1096		1096
1097	case $with_gnutls_libs in	1097	case $with_gnutls_libs in
1098	""\|-L*) ;;	1098	""\|-L*) ;;
Lines 1101-1109 Link Here
1101		1101
1102	AC_CACHE_CHECK([for GNUTLS libraries], gnutls_libs,	1102	AC_CACHE_CHECK([for GNUTLS libraries], gnutls_libs,
1103	[	1103	[
1104	LDFLAGS="$LDFLAGS $with_gnutls_libs -lgnutls -lgcrypt"	1104	LIBS="$LIBS $with_gnutls_libs -lgnutls -lgcrypt"
1105	AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no")	1105	AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no")
1106	LDFLAGS="$LDFLAGS_save"	1106	LIBS="$LIBS_save"
1107	])	1107	])
1108		1108
1109	if test "x$gnutls_libs" != "xno"; then	1109	if test "x$gnutls_libs" != "xno"; then
Lines 1347-1353 Link Here
1347	AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,	1347	AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
1348	[	1348	[
1349	LIBS_save=$LIBS	1349	LIBS_save=$LIBS
1350	LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"	1350	LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs"
1351	LIBS="$nsslibs $nsprlibs"	1351	LIBS="$nsslibs $nsprlibs"
1352		1352
1353	AC_TRY_LINK_FUNC(NSS_Init,	1353	AC_TRY_LINK_FUNC(NSS_Init,
Lines 1356-1362 Link Here
1356		1356
1357	if test "x$moz_nss_libs" = "xno"; then	1357	if test "x$moz_nss_libs" = "xno"; then
1358	nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"	1358	nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
1359	LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"	1359	LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs"
		1360	LIBS="$LIBS $nsslibs"
1360	AC_TRY_LINK_FUNC(NSS_Init,	1361	AC_TRY_LINK_FUNC(NSS_Init,
1361	[moz_nss_libs="yes"],	1362	[moz_nss_libs="yes"],
1362	[moz_nss_libs="no"])	1363	[moz_nss_libs="no"])