summaryrefslogtreecommitdiff
path: root/aconfigure.ac
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2010-08-05 06:27:20 +0000
committerBenny Prijono <bennylp@teluu.com>2010-08-05 06:27:20 +0000
commit1c2ccba9315fdee71bc6c542abe58bee6e6e2215 (patch)
tree9284362788e57b4d107d78fb785a3dc8ac4403af /aconfigure.ac
parente16ec2d63a3fc9864ded2e7e703012fcf936931d (diff)
Re #1068 (misc): fixed error in cross compiling Mingw on a Linux box (thanks Atik Khan for the report)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3246 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'aconfigure.ac')
-rw-r--r--aconfigure.ac17
1 files changed, 15 insertions, 2 deletions
diff --git a/aconfigure.ac b/aconfigure.ac
index 4e54ade8..cfc03e24 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -41,6 +41,13 @@ AC_PROG_CC
AC_PROG_CXX
AC_LANG_C
+dnl #
+dnl # Setup CROSS_COMPILE variable
+dnl #
+if test -z "$CROSS_COMPILE"; then
+ CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
+fi
+
if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
AC_SUBST(AR)
if test "$LD" = ""; then LD="$CC"; fi
@@ -70,9 +77,15 @@ AC_SUBST(CC_CFLAGS)
AC_SUBST(ac_pjdir)
AC_SUBST(ac_build_mak_vars)
-case $target in
+
+case $host in
*mingw* | *cygw* | *win32* | *w32* )
- ac_pjdir=`pwd -W`
+ if pwd -W 2&> /dev/null; then
+ ac_pjdir=`pwd -W`
+ else
+ # We're probably cross-compiling mingw on Linux
+ ac_pjdir=`pwd`
+ fi
;;
*)
ac_pjdir=`pwd`