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