From 0deb9d5e96b731844432bf7e4c51b7811b6a4123 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Mon, 17 Aug 2009 10:40:03 +0000
Subject: [PATCH] again a few changes to make it work with mingw environment.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@573 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/configure.in                | 16 +++++++++-------
 linphone/mediastreamer2/configure.ac |  6 +++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/linphone/configure.in b/linphone/configure.in
index 25aeb1942..bf3557ab1 100644
--- a/linphone/configure.in
+++ b/linphone/configure.in
@@ -56,12 +56,14 @@ AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
 
 
-dnl if test "$mingw_found" = "yes" ; then
-dnl	AC_MSG_NOTICE([Hacking libtool to work with mingw...])
-dnl	sed -e 's/\*\" \$a_deplib \"\*/\*/' < ./libtool > libtool.tmp
-dnl	cp -f ./libtool.tmp ./libtool
-dnl	rm -f ./libtool.tmp
-dnl fi
+AC_CONFIG_COMMANDS([libtool-hacking],[
+if test "$mingw_found" = "yes" ; then
+	echo "Hacking libtool to work with mingw..."
+	sed -e 's/\*\" \$a_deplib \"\*/\*/' < ./libtool > libtool.tmp
+	cp -f ./libtool.tmp ./libtool
+	rm -f ./libtool.tmp
+fi
+],[mingw_found=$mingw_found])
 
 dnl Add the languages which your application supports here.
 PKG_PROG_PKG_CONFIG
@@ -75,7 +77,7 @@ AM_GNU_GETTEXT([external])
 else
 AC_DEFINE(ENABLE_NLS,1,[Tells whether localisation is possible])
 AC_DEFINE(HAVE_GETTEXT,1,[Tells wheter localisation is possible])
-LIBS="$LIBS -L/usr/local/lib -lintl"
+LIBS="$LIBS -L/usr/lib -lintl"
 fi
 
 GETTEXT_PACKAGE=linphone
diff --git a/linphone/mediastreamer2/configure.ac b/linphone/mediastreamer2/configure.ac
index ea020a1af..8e352d799 100644
--- a/linphone/mediastreamer2/configure.ac
+++ b/linphone/mediastreamer2/configure.ac
@@ -149,12 +149,16 @@ esac
 
 AM_CONDITIONAL(BUILD_MACOSX, test x$macosx_found = xyes)
 
+AC_CONFIG_COMMANDS([libtool-hacking],[
 if test "$mingw_found" = "yes" ; then
-	AC_MSG_NOTICE([Hacking libtool to work with mingw...])
+	echo "Hacking libtool to work with mingw..."
 	sed -e 's/\*\" \$a_deplib \"\*/\*/' < ./libtool > libtool.tmp
 	cp -f ./libtool.tmp ./libtool
 	rm -f ./libtool.tmp
+else
+	echo "No need to hack libtool."
 fi
+], [mingw_found=$mingw_found])
 
 
 dnl prefer fixed point computations