diff options
| -rw-r--r-- | appveyor.yml | 9 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 10 insertions, 13 deletions
diff --git a/appveyor.yml b/appveyor.yml index 004dee321..487c06623 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ environment: global: MAKEJOBS: 2 -matrix: + matrix: - SWIGLANG: csharp VSVER: 12 - SWIGLANG: csharp @@ -20,6 +20,8 @@ matrix: # VSVER: 14 # VER: 36 # PY3: 3 +# - SWIGLANG: python +# OSVARIANT: cygwin - SWIGLANG: python OSVARIANT: mingw VER: 27 @@ -29,11 +31,6 @@ matrix: VER: 37 PY3: 3 -allow_failures: -# Currently failing due to not detecting header files/include paths - - swiglang: python - osvariant: cygwin - install: - date /T & time /T - ps: >- diff --git a/configure.ac b/configure.ac index 23c59deea..d61ecbf42 100644 --- a/configure.ac +++ b/configure.ac @@ -459,7 +459,7 @@ else alllang_default=yes fi -AC_CHECK_PROGS(PKGCONFIG, [pkg-config]) +AC_CHECK_PROGS([PKG_CONFIG], [pkg-config]) #-------------------------------------------------------------------- # Look for Tcl @@ -1235,8 +1235,8 @@ else AC_MSG_CHECKING(for Scilab header files) if test "$SCILABINCDIR" != ""; then dirs="$SCILABINCDIR" - elif test -n "$PKGCONFIG"; then - dirs=`$PKGCONFIG scilab --cflags-only-I | sed -e 's/-I//g'` + elif test -n "$PKG_CONFIG "; then + dirs=`$PKG_CONFIG scilab --cflags-only-I | sed -e 's/-I//g'` else dirs="" fi @@ -1620,11 +1620,11 @@ else # check for JavaScriptCore/Webkit libraries AC_ARG_WITH(jscorelib,[ --with-jscorelib=path Set location of the JavaScriptCore/Webkit library directory],[JSCORELIB="-L$withval"], [JSCORELIB=]) - if test -z "$JSCORELIB" -a -n "$PKGCONFIG"; then + if test -z "$JSCORELIB" -a -n "$PKG_CONFIG "; then AC_MSG_CHECKING(for JavaScriptCore/Webkit library) - if $PKGCONFIG javascriptcoregtk-1.0; then - JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0` - JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0` + if $PKG_CONFIG javascriptcoregtk-1.0; then + JSCORELIB=`$PKG_CONFIG --libs javascriptcoregtk-1.0` + JSCOREVERSION=`$PKG_CONFIG --modversion javascriptcoregtk-1.0` fi if test -z "$JSCORELIB"; then AC_MSG_RESULT(not found) |