? exosip/eXosip.loT
? gtk/.deps
? gtk/Makefile
? gtk/Makefile.in
? m4/osip.m4-pat
? mediastreamer2/build/win32-novideo/Makefile
? oRTP/doc
? oRTP/ortp.doxygen
? po/stamp-it
Index: m4/osip.m4
===================================================================
RCS file: /sources/linphone/linphone/m4/osip.m4,v
retrieving revision 1.3
diff -u -3 -p -r1.3 osip.m4
--- m4/osip.m4	3 Feb 2007 11:00:12 -0000	1.3
+++ m4/osip.m4	25 Mar 2007 21:30:56 -0000
@@ -13,29 +13,41 @@ AC_HELP_STRING([--with-osip-version=VERS
 	[Set osip legacy version @<:@empty@:>@]),
 	[osip_legacy_version="-${withval}"],
 	[osip_legacy_version=""])
-if test -z "$osip_legacy_version"; then
-	OSIP_CFLAGS="-I${osip_prefix}/include"
-else
-	OSIP_CFLAGS="-I${osip_prefix}/include/osip2${osip_legacy_version}"
+
+osip_pkgconfig=true
+osip_pkgconfig_file=libosip2
+if test -n "$osip_legacy_version"; then
+	osip_pkgconfig_file=libosip2${osip_legacy_version}
 fi
 
+PKG_CHECK_MODULES(OSIP, $osip_pkgconfig_file, ,osip_pkgconfig=false)
+
+if test $osip_pkgconfig = false; then
+
+	if test -z "$osip_legacy_version"; then
+		OSIP_CFLAGS="-I${osip_prefix}/include"
+	else
+		OSIP_CFLAGS="-I${osip_prefix}/include/osip2${osip_legacy_version}"
+	fi
+
 dnl check osip2 headers
-CPPFLAGS_save=$CPPFLAGS
-CPPFLAGS=$OSIP_CFLAGS
-AC_CHECK_HEADER([osip2/osip.h], ,AC_MSG_ERROR([Could not find osip2 headers !]))
-CPPFLAGS=$CPPFLAGS_save
+	CPPFLAGS_save=$CPPFLAGS
+	CPPFLAGS=$OSIP_CFLAGS
+	AC_CHECK_HEADER([osip2/osip.h], ,AC_MSG_ERROR([Could not find osip2 headers !]))
+	CPPFLAGS=$CPPFLAGS_save
 
 dnl check for osip2 libs
-OSIP_LIBS="-L$osip_prefix/lib -losipparser2${osip_legacy_version}"
-LDFLAGS_save=$LDFLAGS
-LDFLAGS=$OSIP_LIBS
-LIBS_save=$LIBS
-AC_CHECK_LIB(osip2${osip_legacy_version},osip_init, , AC_MSG_ERROR([Could not find osip2 library !]),[-losipparser2${osip_legacy_version} -lpthread])
-AC_CHECK_LIB(osipparser2${osip_legacy_version},osip_message_init, , AC_MSG_ERROR([Could not find osipparser2 library !]),[-lpthread])
+	OSIP_LIBS="-L$osip_prefix/lib -losipparser2${osip_legacy_version}"
+	LDFLAGS_save=$LDFLAGS
+	LDFLAGS=$OSIP_LIBS
+	LIBS_save=$LIBS
+	AC_CHECK_LIB(osip2${osip_legacy_version},osip_init, , AC_MSG_ERROR([Could not find osip2 library !]),[-losipparser2${osip_legacy_version} -lpthread])
+	AC_CHECK_LIB(osipparser2${osip_legacy_version},osip_message_init, , AC_MSG_ERROR([Could not find osipparser2 library !]),[-lpthread])
 dnl AC_CHECK_LIB adds osip2 & osipparser2 to LIBS
-OSIP_LIBS=$LIBS
-LDFLAGS=$LDFLAGS_save
-LIBS=$LIBS_save
+	OSIP_LIBS=$LIBS
+	LDFLAGS=$LDFLAGS_save
+	LIBS=$LIBS_save
+fi
 
 AC_SUBST(OSIP_CFLAGS)
 AC_SUBST(OSIP_LIBS)