sac-openssl.m4, rules/sofia.am: fixed openssl configuration using pkg-config

darcs-hash:20070307103351-88462-fa81cf3c31e88c6d2b4d03c71f56e72e7c397ab5.gz

m4/sac-openssl.m4

@@ -14,8 +14,9 @@ if test "$with_openssl" = no  ;then
 else
 
   if test "$with_openssl" = "pkg-config" ; then 
-    PKG_CHECK_MODULES(openssl, openssl, [
-	HAVE_TLS=1 HAVE_OPENSSL=1], [HAVE_OPENSSL=0])
+    PKG_CHECK_MODULES(openssl, openssl,
+	[HAVE_TLS=1 HAVE_OPENSSL=1 LIBS="$openssl_LIBS $LIBS"],
+	[HAVE_OPENSSL=0])
   fi
 
   if test $HAVE_OPENSSL = 1 ; then

rules/sofia.am

 # common Makefile targets for libsofia-sip-ua(-glib) modules
 # ----------------------------------------------------------
 
-AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(OPENSSL_CFLAGS)
-AM_LIBS =   $(OPENSSL_LIBS)
+AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS)
 
 # Use with --enable-ndebug
 if NDEBUG