| Message ID | 1354018780-23944-1-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Nov 27, 2012 at 12:19 PM, Gerd Hoffmann <kraxel@redhat.com> wrote: > When older versions are found the internal pixman version is prefered. Isn't this 1.3 material? > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > configure | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 780b19a..1a3458f 100755 > --- a/configure > +++ b/configure > @@ -2103,7 +2103,7 @@ fi > # pixman support probe > > if test "$pixman" = ""; then > - if $pkg_config pixman-1 > /dev/null 2>&1; then > + if $pkg_config --atleast-version=0.18.4 pixman-1 > /dev/null 2>&1; then > pixman="system" > else > pixman="internal" > @@ -2114,7 +2114,7 @@ if test "$pixman" = "system"; then > pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null` > else > if test ! -d ${source_path}/pixman/pixman; then > - echo "ERROR: pixman not present. Your options:" > + echo "ERROR: pixman not present (or older than 0.18.4). Your options:" > echo " (1) Prefered: Install the pixman devel package (any recent" > echo " distro should have packages as Xorg needs pixman too)." > echo " (2) Fetch the pixman submodule, using:" > -- > 1.7.1 > >
Thanks, applied. On Tue, Nov 27, 2012 at 12:19 PM, Gerd Hoffmann <kraxel@redhat.com> wrote: > When older versions are found the internal pixman version is prefered. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > configure | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 780b19a..1a3458f 100755 > --- a/configure > +++ b/configure > @@ -2103,7 +2103,7 @@ fi > # pixman support probe > > if test "$pixman" = ""; then > - if $pkg_config pixman-1 > /dev/null 2>&1; then > + if $pkg_config --atleast-version=0.18.4 pixman-1 > /dev/null 2>&1; then > pixman="system" > else > pixman="internal" > @@ -2114,7 +2114,7 @@ if test "$pixman" = "system"; then > pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null` > else > if test ! -d ${source_path}/pixman/pixman; then > - echo "ERROR: pixman not present. Your options:" > + echo "ERROR: pixman not present (or older than 0.18.4). Your options:" > echo " (1) Prefered: Install the pixman devel package (any recent" > echo " distro should have packages as Xorg needs pixman too)." > echo " (2) Fetch the pixman submodule, using:" > -- > 1.7.1 > >
diff --git a/configure b/configure index 780b19a..1a3458f 100755 --- a/configure +++ b/configure @@ -2103,7 +2103,7 @@ fi # pixman support probe if test "$pixman" = ""; then - if $pkg_config pixman-1 > /dev/null 2>&1; then + if $pkg_config --atleast-version=0.18.4 pixman-1 > /dev/null 2>&1; then pixman="system" else pixman="internal" @@ -2114,7 +2114,7 @@ if test "$pixman" = "system"; then pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null` else if test ! -d ${source_path}/pixman/pixman; then - echo "ERROR: pixman not present. Your options:" + echo "ERROR: pixman not present (or older than 0.18.4). Your options:" echo " (1) Prefered: Install the pixman devel package (any recent" echo " distro should have packages as Xorg needs pixman too)." echo " (2) Fetch the pixman submodule, using:"
When older versions are found the internal pixman version is prefered. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)