jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'vadz-msw-srcdir'

Browse source 
* vadz-msw-srcdir:
  SWIG_LIB fix for out of source MinGW builds
  Use "mixed" path to source directory under Cygwin.
This commit is contained in:
William S Fulton 2015-08-02 10:07:59 +01:00
commit 130834aac2
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
configure.ac
View file

@ -2791,6 +2791,16 @@ AC_SUBST(SKIP_ANDROID)
ABS_SRCDIR=`(cd ${srcdir} && pwd)` ABS_SRCDIR=`(cd ${srcdir} && pwd)`
dnl Under Cygwin, we may need native absolute path as it is used by SWIG, which
dnl may be a native, and not a Cygwin, program (this is the case when it's
dnl built using MinGW or cccl compiler in Cygwin environment). However it may,
dnl although this is probably more rare, also be built as a Cygwin program.
dnl Using "mixed" path like we do here allows the path to work in both cases.
case $host in
*-*-mingw* ) ABS_SRCDIR=`${srcdir}/Tools/convertpath -m $ABS_SRCDIR` ;;
*-*-cygwin* ) ABS_SRCDIR=`cygpath --mixed $ABS_SRCDIR` ;;
esac
# Root directory # Root directory
ROOT_DIR=`pwd` ROOT_DIR=`pwd`
case $host in case $host in
@ -2828,12 +2838,20 @@ case $build in
esac esac
AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)]) AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)])
# For testing - Windows builds of SWIG do not need SWIG_LIB set dnl For testing purposes, don't set SWIG_LIB_PREINST when building SWIG in the
AC_EGREP_CPP([yes], dnl source directory under Windows because it is supposed to work without
[#ifdef _WIN32 dnl SWIG_LIB being set at all in this particular case.
yes if test "${srcdir}" = "."; then
#endif AC_EGREP_CPP([yes],
], [SWIG_LIB_PREINST=], [SWIG_LIB_PREINST=$ABS_SRCDIR/Lib]) [#ifdef _WIN32
yes
#endif
], [SWIG_LIB_PREINST=], [SWIG_LIB_PREINST=$ABS_SRCDIR/Lib])
else
dnl When not building in source directory, we must always set SWIG_LIB,
dnl even under Windows, as things couldn't work without it.
SWIG_LIB_PREINST=$ABS_SRCDIR/Lib
fi
AC_SUBST(SWIG_LIB_PREINST) AC_SUBST(SWIG_LIB_PREINST)
AC_CONFIG_FILES([ AC_CONFIG_FILES([