|
 |
ad650f |
diff --git a/configure b/configure
|
|
|
ad650f |
index 6d13cbd..f68b14f 100755
|
|
|
ad650f |
--- a/configure
|
|
|
ad650f |
+++ b/configure
|
|
|
ad650f |
@@ -13236,12 +13236,12 @@ if test -n "$VARNISHAPI_LIBDIR"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_LIBDIR="$VARNISHAPI_LIBDIR"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_LIBDIR=`$PKG_CONFIG --variable="libdir" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_LIBDIR=`$PKG_CONFIG --variable="libdir" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13388,12 +13388,12 @@ if test -n "$VARNISHAPI_CFLAGS"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_CFLAGS="$VARNISHAPI_CFLAGS"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_CFLAGS=`$PKG_CONFIG --cflags "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_CFLAGS=`$PKG_CONFIG --cflags "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13405,12 +13405,12 @@ if test -n "$VARNISHAPI_LIBS"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_LIBS="$VARNISHAPI_LIBS"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_LIBS=`$PKG_CONFIG --libs "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_LIBS=`$PKG_CONFIG --libs "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13431,9 +13431,9 @@ else
|
|
|
ad650f |
_pkg_short_errors_supported=no
|
|
|
ad650f |
fi
|
|
|
ad650f |
if test $_pkg_short_errors_supported = yes; then
|
|
|
ad650f |
- VARNISHAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "varnishapi" 2>&1`
|
|
|
ad650f |
+ VARNISHAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "rh-varnish6-varnishapi" 2>&1`
|
|
|
ad650f |
else
|
|
|
ad650f |
- VARNISHAPI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "varnishapi" 2>&1`
|
|
|
ad650f |
+ VARNISHAPI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "rh-varnish6-varnishapi" 2>&1`
|
|
|
ad650f |
fi
|
|
|
ad650f |
# Put the nasty error message in config.log where it belongs
|
|
|
ad650f |
echo "$VARNISHAPI_PKG_ERRORS" >&5
|
|
|
ad650f |
@@ -13470,7 +13470,7 @@ else
|
|
|
ad650f |
$as_echo "yes" >&6; }
|
|
|
ad650f |
|
|
|
ad650f |
fi
|
|
|
ad650f |
- VARNISH_VERSION=$($PKG_CONFIG --modversion varnishapi)
|
|
|
ad650f |
+ VARNISH_VERSION=$($PKG_CONFIG --modversion rh-varnish6-varnishapi)
|
|
|
ad650f |
|
|
|
ad650f |
|
|
|
ad650f |
|
|
|
ad650f |
@@ -13478,12 +13478,12 @@ if test -n "$VARNISHAPI_PREFIX"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_PREFIX="$VARNISHAPI_PREFIX"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_PREFIX=`$PKG_CONFIG --variable="prefix" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_PREFIX=`$PKG_CONFIG --variable="prefix" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13501,12 +13501,12 @@ if test -n "$VARNISHAPI_DATAROOTDIR"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_DATAROOTDIR="$VARNISHAPI_DATAROOTDIR"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_DATAROOTDIR=`$PKG_CONFIG --variable="datarootdir" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_DATAROOTDIR=`$PKG_CONFIG --variable="datarootdir" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13524,12 +13524,12 @@ if test -n "$VARNISHAPI_LIBDIR"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_LIBDIR="$VARNISHAPI_LIBDIR"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_LIBDIR=`$PKG_CONFIG --variable="libdir" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_LIBDIR=`$PKG_CONFIG --variable="libdir" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13547,12 +13547,12 @@ if test -n "$VARNISHAPI_BINDIR"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_BINDIR="$VARNISHAPI_BINDIR"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_BINDIR=`$PKG_CONFIG --variable="bindir" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_BINDIR=`$PKG_CONFIG --variable="bindir" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13570,12 +13570,12 @@ if test -n "$VARNISHAPI_SBINDIR"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_SBINDIR="$VARNISHAPI_SBINDIR"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_SBINDIR=`$PKG_CONFIG --variable="sbindir" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_SBINDIR=`$PKG_CONFIG --variable="sbindir" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13593,12 +13593,12 @@ if test -n "$VARNISHAPI_VCLDIR"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_VCLDIR="$VARNISHAPI_VCLDIR"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_VCLDIR=`$PKG_CONFIG --variable="vcldir" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_VCLDIR=`$PKG_CONFIG --variable="vcldir" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13616,12 +13616,12 @@ if test -n "$VARNISHAPI_VMODDIR"; then
|
|
|
ad650f |
pkg_cv_VARNISHAPI_VMODDIR="$VARNISHAPI_VMODDIR"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VARNISHAPI_VMODDIR=`$PKG_CONFIG --variable="vmoddir" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VARNISHAPI_VMODDIR=`$PKG_CONFIG --variable="vmoddir" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13640,12 +13640,12 @@ if test -n "$VMODTOOL"; then
|
|
|
ad650f |
pkg_cv_VMODTOOL="$VMODTOOL"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VMODTOOL=`$PKG_CONFIG --variable="vmodtool" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VMODTOOL=`$PKG_CONFIG --variable="vmodtool" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13663,12 +13663,12 @@ if test -n "$VSCTOOL"; then
|
|
|
ad650f |
pkg_cv_VSCTOOL="$VSCTOOL"
|
|
|
ad650f |
elif test -n "$PKG_CONFIG"; then
|
|
|
ad650f |
if test -n "$PKG_CONFIG" && \
|
|
|
ad650f |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"varnishapi\""; } >&5
|
|
|
ad650f |
- ($PKG_CONFIG --exists --print-errors "varnishapi") 2>&5
|
|
|
ad650f |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rh-varnish6-varnishapi\""; } >&5
|
|
|
ad650f |
+ ($PKG_CONFIG --exists --print-errors "rh-varnish6-varnishapi") 2>&5
|
|
|
ad650f |
ac_status=$?
|
|
|
ad650f |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
ad650f |
test $ac_status = 0; }; then
|
|
|
ad650f |
- pkg_cv_VSCTOOL=`$PKG_CONFIG --variable="vsctool" "varnishapi" 2>/dev/null`
|
|
|
ad650f |
+ pkg_cv_VSCTOOL=`$PKG_CONFIG --variable="vsctool" "rh-varnish6-varnishapi" 2>/dev/null`
|
|
|
ad650f |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
ad650f |
else
|
|
|
ad650f |
pkg_failed=yes
|
|
|
ad650f |
@@ -13695,7 +13695,7 @@ fi
|
|
|
ad650f |
fi
|
|
|
ad650f |
|
|
|
ad650f |
vcldir=$($PKG_CONFIG --define-variable=datadir=$datadir \
|
|
|
ad650f |
- --variable=vcldir varnishapi)
|
|
|
ad650f |
+ --variable=vcldir rh-varnish6-varnishapi)
|
|
|
ad650f |
|
|
|
ad650f |
|
|
|
ad650f |
pkgvcldir=\${vcldir}/\${PACKAGE}
|
|
|
ad650f |
@@ -14255,7 +14255,7 @@ fi
|
|
|
ad650f |
|
|
|
ad650f |
|
|
|
ad650f |
vmoddir=$($PKG_CONFIG --define-variable=libdir=$libdir \
|
|
|
ad650f |
- --variable=vmoddir varnishapi)
|
|
|
ad650f |
+ --variable=vmoddir rh-varnish6-varnishapi)
|
|
|
ad650f |
|
|
|
ad650f |
|
|
|
ad650f |
am__v_VMODTOOL_0='@echo " VMODTOOL" $''@;'
|