mirror of
https://git.freebsd.org/ports.git
synced 2025-07-13 07:19:16 -04:00
98 lines
2.8 KiB
Text
98 lines
2.8 KiB
Text
--- configure.orig 2013-11-20 11:27:41.000000000 +0000
|
|
+++ configure 2014-08-10 12:16:46.974210130 +0000
|
|
@@ -17262,7 +17262,7 @@
|
|
;;
|
|
esac
|
|
case "$LEX" in
|
|
- flex*) : ;;
|
|
+ *flex*) : ;;
|
|
*)
|
|
if test "x$enable_jaql" = xyes; then
|
|
as_fn_error $? "MonetDB/JAQL requires flex" "$LINENO" 5
|
|
@@ -17802,6 +17802,7 @@
|
|
/* end confdefs.h. */
|
|
#include <stdio.h>
|
|
#include <bzlib.h>
|
|
+#include <zlib.h>
|
|
int
|
|
main ()
|
|
{
|
|
@@ -20575,76 +20576,9 @@
|
|
|
|
|
|
pkg_failed=no
|
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
|
|
-$as_echo_n "checking for zlib... " >&6; }
|
|
-
|
|
-if test -n "$zlib_CFLAGS"; then
|
|
- pkg_cv_zlib_CFLAGS="$zlib_CFLAGS"
|
|
- elif test -n "$PKG_CONFIG"; then
|
|
- if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
- test $ac_status = 0; }; then
|
|
- pkg_cv_zlib_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
|
|
- test "x$?" != "x0" && pkg_failed=yes
|
|
-else
|
|
- pkg_failed=yes
|
|
-fi
|
|
- else
|
|
- pkg_failed=untried
|
|
-fi
|
|
-if test -n "$zlib_LIBS"; then
|
|
- pkg_cv_zlib_LIBS="$zlib_LIBS"
|
|
- elif test -n "$PKG_CONFIG"; then
|
|
- if test -n "$PKG_CONFIG" && \
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
|
|
- ac_status=$?
|
|
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
- test $ac_status = 0; }; then
|
|
- pkg_cv_zlib_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
|
|
- test "x$?" != "x0" && pkg_failed=yes
|
|
-else
|
|
- pkg_failed=yes
|
|
-fi
|
|
- else
|
|
- pkg_failed=untried
|
|
-fi
|
|
-
|
|
-
|
|
-
|
|
-if test $pkg_failed = yes; then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
-
|
|
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
- _pkg_short_errors_supported=yes
|
|
-else
|
|
- _pkg_short_errors_supported=no
|
|
-fi
|
|
- if test $_pkg_short_errors_supported = yes; then
|
|
- zlib_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib" 2>&1`
|
|
- else
|
|
- zlib_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib" 2>&1`
|
|
- fi
|
|
- # Put the nasty error message in config.log where it belongs
|
|
- echo "$zlib_PKG_ERRORS" >&5
|
|
-
|
|
- have_zlib="no"; why_have_zlib="(zlib not found)"
|
|
-elif test $pkg_failed = untried; then
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
-$as_echo "no" >&6; }
|
|
- have_zlib="no"; why_have_zlib="(zlib not found)"
|
|
-else
|
|
- zlib_CFLAGS=$pkg_cv_zlib_CFLAGS
|
|
- zlib_LIBS=$pkg_cv_zlib_LIBS
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
-$as_echo "yes" >&6; }
|
|
have_zlib="yes"
|
|
-fi
|
|
-if test x"$have_zlib" = x"yes" ; then
|
|
+
|
|
+if x"$have_zlib" = x"yes" ; then
|
|
|
|
$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
|
|
|