diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2020-06-12 23:09:31 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2020-06-12 23:09:31 +0100 |
| commit | 23e5362882e60bc3f54f7c8afde9a1d28c8c746a (patch) | |
| tree | 6c164d0f718266d31d8504d3845610fdb84aaf96 | |
| parent | d3fa519a9c83f817d565899f915fde323a490195 (diff) | |
| parent | 24945669fd9238f5fea8d48281ec694640ce645f (diff) | |
| download | swig-23e5362882e60bc3f54f7c8afde9a1d28c8c746a.tar.gz | |
Merge branch 'vapier-master'
* vapier-master:
configure: change $PKGCONFIG to $PKG_CONFIG
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
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) |