call PKG_PROG_PKG_CONFIG explicitly from xdbebizzy's configure.ac, since
otherwise --disable-xprint leaves us without PKG_CONFIG defined.
This commit is contained in:
Steve Langasek
parent
0024136c21
commit
e459831c04
|
|
@ -8,6 +8,9 @@ xbase-clients (1:7.1.ds-1) unstable; urgency=low
|
|||
package to consistently build *without* xprint support, instead of
|
||||
autodetecting (and possibly failing) based on whether libxp-dev is
|
||||
installed. Properly closes: #366275.
|
||||
* Also call PKG_PROG_PKG_CONFIG explicitly from xdbebizzy's
|
||||
configure.ac, since otherwise --disable-xprint leaves us without
|
||||
PKG_CONFIG defined.
|
||||
|
||||
[ David Nusinow ]
|
||||
* This update should include all the apps released with X11R7.1. Version the
|
||||
|
|
|
|||
|
|
@ -0,0 +1,132 @@
|
|||
Index: xdbedizzy-X11R7.0-1.0.1/configure.ac
|
||||
===================================================================
|
||||
--- xdbedizzy-X11R7.0-1.0.1/configure.ac (revision 2182)
|
||||
+++ xdbedizzy-X11R7.0-1.0.1/configure.ac (working copy)
|
||||
@@ -35,6 +35,10 @@
|
||||
|
||||
AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
|
||||
[use_xprint=$enableval],[use_xprint=auto])
|
||||
+
|
||||
+dnl Call this explicitly first, otherwise the following if may leave us
|
||||
+dnl without $PKG_CONFIG defined!
|
||||
+PKG_PROG_PKG_CONFIG
|
||||
if test "x$use_xprint" = "xauto"; then
|
||||
PKG_CHECK_MODULES(XPRINT, xp, use_xprint=yes, use_xprint=no)
|
||||
fi
|
||||
Index: xdbedizzy-X11R7.0-1.0.1/configure
|
||||
===================================================================
|
||||
--- xdbedizzy-X11R7.0-1.0.1/configure (revision 2182)
|
||||
+++ xdbedizzy-X11R7.0-1.0.1/configure (working copy)
|
||||
@@ -951,7 +951,7 @@
|
||||
else
|
||||
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
|
||||
fi
|
||||
- cd $ac_popdir
|
||||
+ cd "$ac_popdir"
|
||||
done
|
||||
fi
|
||||
|
||||
@@ -2305,8 +2305,7 @@
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
- { ac_try='test -z "$ac_c_werror_flag"
|
||||
- || test ! -s conftest.err'
|
||||
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
@@ -2364,8 +2363,7 @@
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
- { ac_try='test -z "$ac_c_werror_flag"
|
||||
- || test ! -s conftest.err'
|
||||
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
@@ -2481,8 +2479,7 @@
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
- { ac_try='test -z "$ac_c_werror_flag"
|
||||
- || test ! -s conftest.err'
|
||||
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
@@ -2536,8 +2533,7 @@
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
- { ac_try='test -z "$ac_c_werror_flag"
|
||||
- || test ! -s conftest.err'
|
||||
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
@@ -2582,8 +2578,7 @@
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
- { ac_try='test -z "$ac_c_werror_flag"
|
||||
- || test ! -s conftest.err'
|
||||
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
@@ -2627,8 +2622,7 @@
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
- { ac_try='test -z "$ac_c_werror_flag"
|
||||
- || test ! -s conftest.err'
|
||||
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
@@ -2923,9 +2917,9 @@
|
||||
else
|
||||
use_xprint=auto
|
||||
fi;
|
||||
-if test "x$use_xprint" = "xauto"; then
|
||||
|
||||
|
||||
+
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
||||
@@ -3029,6 +3023,7 @@
|
||||
fi
|
||||
|
||||
fi
|
||||
+if test "x$use_xprint" = "xauto"; then
|
||||
|
||||
pkg_failed=no
|
||||
echo "$as_me:$LINENO: checking for XPRINT" >&5
|
||||
@@ -4400,11 +4395,6 @@
|
||||
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
|
||||
esac
|
||||
|
||||
- if test x"$ac_file" != x-; then
|
||||
- { echo "$as_me:$LINENO: creating $ac_file" >&5
|
||||
-echo "$as_me: creating $ac_file" >&6;}
|
||||
- rm -f "$ac_file"
|
||||
- fi
|
||||
# Let's still pretend it is `configure' which instantiates (i.e., don't
|
||||
# use $as_me), people would be surprised to read:
|
||||
# /* config.h. Generated by config.status. */
|
||||
@@ -4443,6 +4433,12 @@
|
||||
fi;;
|
||||
esac
|
||||
done` || { (exit 1); exit 1; }
|
||||
+
|
||||
+ if test x"$ac_file" != x-; then
|
||||
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
|
||||
+echo "$as_me: creating $ac_file" >&6;}
|
||||
+ rm -f "$ac_file"
|
||||
+ fi
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
sed "$ac_vpsub
|
||||
|
|
@ -9,3 +9,4 @@
|
|||
10_debian_add_xkbpath_env_variable.diff -p0
|
||||
11_xkb_documentation_updates.diff -p0
|
||||
12_startx_paths.diff
|
||||
pkgconfig_naughtiness -p0
|
||||
|
|
|
|||
Loading…
Reference in New Issue