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

Merge branch 'vapier-master'

Browse source 
* vapier-master:
  configure: change $PKGCONFIG to $PKG_CONFIG
This commit is contained in:
William S Fulton 2020-06-12 23:09:31 +01:00
commit 23e5362882
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
configure.ac
View file

@ -459,7 +459,7 @@ else
alllang_default=yes alllang_default=yes
fi fi
AC_CHECK_PROGS(PKGCONFIG, [pkg-config]) AC_CHECK_PROGS([PKG_CONFIG], [pkg-config])
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Look for Tcl # Look for Tcl
@ -1235,8 +1235,8 @@ else
AC_MSG_CHECKING(for Scilab header files) AC_MSG_CHECKING(for Scilab header files)
if test "$SCILABINCDIR" != ""; then if test "$SCILABINCDIR" != ""; then
dirs="$SCILABINCDIR" dirs="$SCILABINCDIR"
elif test -n "$PKGCONFIG"; then elif test -n "$PKG_CONFIG "; then
dirs=`$PKGCONFIG scilab --cflags-only-I | sed -e 's/-I//g'` dirs=`$PKG_CONFIG scilab --cflags-only-I | sed -e 's/-I//g'`
else else
dirs="" dirs=""
fi fi
@ -1620,11 +1620,11 @@ else
# check for JavaScriptCore/Webkit libraries # check for JavaScriptCore/Webkit libraries
AC_ARG_WITH(jscorelib,[ --with-jscorelib=path Set location of the JavaScriptCore/Webkit library directory],[JSCORELIB="-L$withval"], [JSCORELIB=]) 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) AC_MSG_CHECKING(for JavaScriptCore/Webkit library)
if $PKGCONFIG javascriptcoregtk-1.0; then if $PKG_CONFIG javascriptcoregtk-1.0; then
JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0` JSCORELIB=`$PKG_CONFIG --libs javascriptcoregtk-1.0`
JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0` JSCOREVERSION=`$PKG_CONFIG --modversion javascriptcoregtk-1.0`
fi fi
if test -z "$JSCORELIB"; then if test -z "$JSCORELIB"; then
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)