diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2015-08-21 22:35:13 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2015-08-21 22:48:34 +0100 |
| commit | abe52396b2e418f9ac9c810feddeedf4adc98bbc (patch) | |
| tree | 2bffad9fc0a9a2c65ecd268a7be862caf29e203d | |
| parent | ca64b0622925d549d49a5349b4177aefbfed263a (diff) | |
| download | swig-no-swig-preinst.tar.gz | |
Leave preinst-swig as a convenience only script for ad-hoc useno-swig-preinst
| -rw-r--r-- | configure.ac | 15 | ||||
| -rwxr-xr-x | preinst-swig.in | 4 |
2 files changed, 5 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index b07463b86..6ea73f327 100644 --- a/configure.ac +++ b/configure.ac @@ -2924,20 +2924,7 @@ case $build in esac AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)]) -dnl For testing purposes, don't set SWIG_LIB_PREINST when building SWIG in the -dnl source directory under Windows because it is supposed to work without -dnl SWIG_LIB being set at all in this particular case. -if test "${srcdir}" = "."; then - AC_EGREP_CPP([yes], - [#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 +SWIG_LIB_PREINST=$ABS_SRCDIR/Lib AC_SUBST(SWIG_LIB_PREINST) dnl For testing purposes, clear SWIG_LIB when building SWIG in the source diff --git a/preinst-swig.in b/preinst-swig.in index e77db7858..4cead1d88 100755 --- a/preinst-swig.in +++ b/preinst-swig.in @@ -1,4 +1,8 @@ #!/bin/sh + +# Convenience script for running SWIG before it is installed. +# Intended for ad-hoc usage and not by the test-suite or examples. + builddir=`dirname $0` SWIG_LIB=@SWIG_LIB_PREINST@ export SWIG_LIB |