diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2014-02-05 13:58:07 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2014-02-05 13:58:07 +0100 |
| commit | 15394897e3ab6737b9eb205bd126422a5d5143e3 (patch) | |
| tree | 82b2654c90ddb5585147c55a5fb7009ba6263fc1 /configure.ac | |
| parent | 47ced4833d8f4a128feba649dddfe37c8980b1c1 (diff) | |
| download | weechat-15394897e3ab6737b9eb205bd126422a5d5143e3.zip | |
core: remove multiple detections of pkg-config in configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 64 |
1 files changed, 28 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index eb10a5af6..94986dd4b 100644 --- a/configure.ac +++ b/configure.ac @@ -621,27 +621,23 @@ if test "x$enable_lua" = "xyes" ; then fi if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then - PKGCONFIG="" - AC_CHECK_PROGS(PKGCONFIG, pkg-config) - if test "x$PKGCONFIG" != "x"; then - AC_MSG_CHECKING(for Lua headers and librairies with pkg-config) - echo - for l in "$lua_suffix" "" "51" "5.1" "50" "5.0" ; do - pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null` - if test "x$?" = "x0" ; then - LUA_VERSION=`$PKGCONFIG --modversion lua$l` - LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l` - LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l` - - pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null` - if test "x$?" = "x0"; then - LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l` - LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l` - fi - break + AC_MSG_CHECKING(for Lua headers and librairies with pkg-config) + echo + for l in "$lua_suffix" "" "51" "5.1" "50" "5.0" ; do + pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null` + if test "x$?" = "x0" ; then + LUA_VERSION=`$PKGCONFIG --modversion lua$l` + LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l` + LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l` + + pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null` + if test "x$?" = "x0"; then + LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l` + LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l` fi - done - fi + break + fi + done fi if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then @@ -773,22 +769,18 @@ if test "x$enable_guile" = "xyes" ; then enable_plugins="yes" guile_found="no" - PKGCONFIG="" - AC_CHECK_PROGS(PKGCONFIG, pkg-config) - if test "x$PKGCONFIG" != "x"; then - AC_MSG_CHECKING(for Guile headers and librairies) - echo - for v in "2.0" ; do - pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null` - if test "x$?" = "x0" ; then - GUILE_VERSION=`$PKGCONFIG --modversion guile-$v` - GUILE_CFLAGS=`$PKGCONFIG --cflags guile-$v` - GUILE_LFLAGS=`$PKGCONFIG --libs guile-$v` - guile_found="yes" - break - fi - done - fi + AC_MSG_CHECKING(for Guile headers and librairies) + echo + for v in "2.0" ; do + pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null` + if test "x$?" = "x0" ; then + GUILE_VERSION=`$PKGCONFIG --modversion guile-$v` + GUILE_CFLAGS=`$PKGCONFIG --cflags guile-$v` + GUILE_LFLAGS=`$PKGCONFIG --libs guile-$v` + guile_found="yes" + break + fi + done if test "x$guile_found" = "xno" ; then AC_MSG_WARN([ |