mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 22:00:31 -04:00
dc8d7d2256
. Remove most options and configure unconditional support for them. This is now a full featured port of gnuplot. If there is enough interest then I'll creating a 'gnuplot-lite' port for a minimalist version.
117 lines
4.7 KiB
Text
117 lines
4.7 KiB
Text
--- configure.orig 2017-11-23 11:59:30.644837000 -0800
|
|
+++ configure 2017-11-23 12:01:09.450617000 -0800
|
|
@@ -11246,12 +11246,12 @@
|
|
pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.3" 2>/dev/null`
|
|
+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.3" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -11264,12 +11264,12 @@
|
|
pkg_cv_LUA_LIBS="$LUA_LIBS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.3" 2>/dev/null`
|
|
+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.3" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -11288,9 +11288,9 @@
|
|
_pkg_short_errors_supported=no
|
|
fi
|
|
if test $_pkg_short_errors_supported = yes; then
|
|
- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.3"`
|
|
+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.3"`
|
|
else
|
|
- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.3"`
|
|
+ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.3"`
|
|
fi
|
|
# Put the nasty error message in config.log where it belongs
|
|
echo "$LUA_PKG_ERRORS" >&5
|
|
@@ -11739,7 +11739,7 @@
|
|
LUA_LIBS=$pkg_cv_LUA_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- LUA=lua5.3
|
|
+ LUA=lua53
|
|
fi
|
|
elif test $pkg_failed = untried; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
@@ -11754,12 +11754,12 @@
|
|
pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.3" 2>/dev/null`
|
|
+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.3" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -11772,12 +11772,12 @@
|
|
pkg_cv_LUA_LIBS="$LUA_LIBS"
|
|
else
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5
|
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.3" 2>/dev/null`
|
|
+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.3" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -11796,9 +11796,9 @@
|
|
_pkg_short_errors_supported=no
|
|
fi
|
|
if test $_pkg_short_errors_supported = yes; then
|
|
- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.3"`
|
|
+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.3"`
|
|
else
|
|
- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.3"`
|
|
+ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.3"`
|
|
fi
|
|
# Put the nasty error message in config.log where it belongs
|
|
echo "$LUA_PKG_ERRORS" >&5
|
|
@@ -12247,7 +12247,7 @@
|
|
LUA_LIBS=$pkg_cv_LUA_LIBS
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
- LUA=lua5.3
|
|
+ LUA=lua53
|
|
fi
|
|
else
|
|
LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
|
|
@@ -12290,7 +12290,7 @@
|
|
return 0;
|
|
}
|
|
_ACEOF
|
|
-for ac_lib in '' lua lua5.3 lua5.2 lua5.1; do
|
|
+for ac_lib in '' lua lua53 lua5.2 lua5.1; do
|
|
if test -z "$ac_lib"; then
|
|
ac_res="none required"
|
|
else
|