diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-07-19 17:49:47 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-02 01:39:25 +0100 |
| commit | bade711c82e43dc7553603bc08907fe9762da88c (patch) | |
| tree | 3e43432c3f288bd520338439611646fe3ac1edf5 | |
| parent | b00b5ea1c5e0cecd50b928a5d88b3be8560c18e7 (diff) | |
| download | qt3-bade711c82e43dc7553603bc08907fe9762da88c.tar.gz qt3-bade711c82e43dc7553603bc08907fe9762da88c.zip | |
Fix to detect XRandR on multi-prefix package platforms
Change to find two XrandR header files from invidual directory.
"Xrandr.h" is in `libXrandr`, and "randr.h" is in `xorgproto` (used to be
`randrproto`) package, so they may be installed into different prefix.
Signed-off-by: OBATA Akio <obache@wizdas.com>
| -rwxr-xr-x | config.tests/x11/xrandr.test | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/config.tests/x11/xrandr.test b/config.tests/x11/xrandr.test index 66a05c5..59145a1 100755 --- a/config.tests/x11/xrandr.test +++ b/config.tests/x11/xrandr.test @@ -43,28 +43,28 @@ if [ -z "$F" ]; then fi # check for Xrandr.h and randr.h -XRANDR_H= RANDR_H= if [ "$XRANDR" = "yes" ]; then - INC="X11/extensions/Xrandr.h" - INC2="X11/extensions/randr.h" + INCS="X11/extensions/Xrandr.h X11/extensions/randr.h" XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` INCDIRS="$IN_INCDIRS $XDIRS /usr/include /include" - F= - for INCDIR in $INCDIRS; do - if [ -f $INCDIR/$INC -a -f $INCDIR/$INC2 ]; then - F=yes - XRANDR_H=$INCDIR/$INC - RANDR_H=$INCDIR/$INC2 - [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" - break + for INC in $INCS; do + F= + for INCDIR in $INCDIRS; do + if [ -f $INCDIR/$INC ]; then + F=yes + [ "$INC" = "X11/extensions/randr.h" ] && RANDR_H=$INCDIR/$INC + [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" + break + fi + done + if [ -z "$F" ] + then + XRANDR=no + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" + break; fi done - if [ -z "$F" ] - then - XRANDR=no - [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" - fi fi # verify that we are using XRandR 1.x >= 1.1 |