diff options
Diffstat (limited to 'graphics/graphviz/files/patch-configure.ac')
| -rw-r--r-- | graphics/graphviz/files/patch-configure.ac | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac index 7445520a6126..29408b73dfb5 100644 --- a/graphics/graphviz/files/patch-configure.ac +++ b/graphics/graphviz/files/patch-configure.ac @@ -1,7 +1,7 @@ ---- configure.ac.orig 2023-09-11 18:30:03 UTC +--- configure.ac.orig 2024-07-04 07:59:36 UTC +++ configure.ac -@@ -620,7 +620,7 @@ else - if test "x$GUILE_CONFIG" = "x"; then +@@ -576,7 +576,7 @@ else + if test "$GUILE_CONFIG" = ""; then use_guile="No (guile not available)" else - [GUILE_VERSION=`$GUILE_CONFIG --version 2>&1 | sed -n '1 s/^.* \+\([0-9\.]\+\)$/\1/ p'`] @@ -9,31 +9,27 @@ GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile) -@@ -800,16 +800,16 @@ else - if test "x$PKG_CONFIG" != "x"; then - AC_MSG_CHECKING(for Lua headers and libraries with pkg-config) - echo -- for l in "$lua_suffix" "" "53" "5.3" "52" "5.2" "51" "5.1" ; do -+ for l in "$lua_suffix" "" "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" ; do +@@ -759,13 +759,13 @@ else + for l in "$lua_suffix" "" "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" ; do pkgconfig_lua_found=`$PKG_CONFIG --exists lua$l 2>/dev/null` - if test "x$?" = "x0" ; then + if test "$?" = "0" ; then - LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l` + LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lua$l` LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lua$l` - LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKG_CONFIG --variable=V lua`" + LUA_INSTALL_DIR="`$PKG_CONFIG --variable=libdir lua$l`/lua" pkgconfig_lualib_found=`$PKG_CONFIG --exists lualib$l 2>/dev/null` - if test "x$?" = "x0"; then + if test "$?" = "0"; then - LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lualib$l` -+ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags-only-I lualib$l` ++ LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --flags-only-I lualib$l` LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l` fi break -@@ -1173,6 +1173,7 @@ else - use_ruby="No (ruby not available)" - else - RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`" -+ RUBY_CFLAGS="${RUBY_CFLAGS} -I`$RUBY $srcdir/config/config_ruby.rb inc`" - RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]\"`" +@@ -1070,6 +1070,7 @@ else + RUBY_CFLAGS="$RUBY_CFLAGS -I`$RUBY $srcdir/config/config_ruby.rb vendorhdrdir`" + RUBY_CFLAGS="$RUBY_CFLAGS -I`$RUBY $srcdir/config/config_ruby.rb sitehdrdir`" + RUBY_CFLAGS="$RUBY_CFLAGS -I`$RUBY $srcdir/config/config_ruby.rb rubyhdrdir`" ++ #RUBY_CFLAGS="${RUBY_CFLAGS} -I`$RUBY $srcdir/config/config_ruby.rb inc`" + RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb libdir` `$RUBY -rrbconfig -e \"puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]\"`" RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`" - if test "x$RUBY_INSTALL_DIR" = "x"; then + if test "$RUBY_INSTALL_DIR" = ""; then |