Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 15265 | Differences between
and this patch

Collapse All | Expand All

(-)configure (-1 / +27 lines)
Lines 264-269 CFG_XKB=auto Link Here
264
CFG_NIS=auto
264
CFG_NIS=auto
265
CFG_CUPS=auto
265
CFG_CUPS=auto
266
CFG_LARGEFILE=auto
266
CFG_LARGEFILE=auto
267
CFG_XCURSOR=no
267
CFG_NEWABI=no ### need to break ABI for full Large File support...
268
CFG_NEWABI=no ### need to break ABI for full Large File support...
268
CFG_STL=auto
269
CFG_STL=auto
269
CFG_NAS=no
270
CFG_NAS=no
Lines 330-336 while [ "$#" -gt 0 ]; do Link Here
330
	VAL=no
331
	VAL=no
331
	;;
332
	;;
332
    #Qt style yes options
333
    #Qt style yes options
333
    -incremental|-qvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-tablet|-stl|-freetype|-big-codecs|-xrender|-xft|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast)
334
    -incremental|-qvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-tablet|-stl|-freetype|-big-codecs|-xrender|-xft|-xkb|-nis|-cups|-largefile|-xcursor|-h|-help|-v|-verbose|-debug|-release|-fast)
334
	VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
335
	VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
335
	VAL=yes
336
	VAL=yes
336
	;;
337
	;;
Lines 755-760 while [ "$#" -gt 0 ]; do Link Here
755
	    UNKNOWN_OPT=yes
756
	    UNKNOWN_OPT=yes
756
	fi
757
	fi
757
	;;
758
	;;
759
    xcursor)
760
        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
761
	    CFG_XCURSOR="$VAL"
762
        else
763
	    UNKNOWN_OPT=yes
764
        fi
765
	;;
758
    newabi)
766
    newabi)
759
	if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
767
	if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
760
	    CFG_NEWABI="$VAL"
768
	    CFG_NEWABI="$VAL"
Lines 1695-1700 Usage: $relconf [-prefix dir] [-buildke Link Here
1695
	[-no-largefile] [-largefile] [-no-stl] [-stl]
1703
	[-no-largefile] [-largefile] [-no-stl] [-stl]
1696
	[-Istring] [-lstring] [-Lstring] [-Rstring] [-disable-<module>]
1704
	[-Istring] [-lstring] [-Lstring] [-Rstring] [-disable-<module>]
1697
	[-with-<module setting>] [-without-<module setting>] [-fast] [-no-fast]
1705
	[-with-<module setting>] [-without-<module setting>] [-fast] [-no-fast]
1706
        [-xcursor]
1698
1707
1699
Installation options:
1708
Installation options:
1700
1709
Lines 1861-1866 if [ "$PLATFORM_X11" = "yes" ]; then Link Here
1861
	XRY="*"
1870
	XRY="*"
1862
	XRN=" "
1871
	XRN=" "
1863
    fi
1872
    fi
1873
    if [ "$CFG_XCURSOR" = "no" ]; then
1874
	XCRY=" "
1875
	XCRN="*"
1876
    else
1877
	XCRY="*"
1878
	XCRN=" "
1879
    fi
1864
    if [ "$CFG_TABLET" = "no" ]; then
1880
    if [ "$CFG_TABLET" = "no" ]; then
1865
	XIY=" "
1881
	XIY=" "
1866
	XIN="*"
1882
	XIN="*"
Lines 1898-1903 Qt/X11 only: Link Here
1898
 $XFTY  -xft ............... Compile Xft support.
1914
 $XFTY  -xft ............... Compile Xft support.
1899
			 Requires X11/Xft/XftFreetype.h and libXft.
1915
			 Requires X11/Xft/XftFreetype.h and libXft.
1900
1916
1917
 $XCRN  -no-xcursor ............ Do not compile with XCursor support 
1918
                                 (use native Qt cursors)
1919
 $XCRY  -xcursor ............... Compile XCursor support.
1920
1921
1901
 $XIN  -no-tablet ......... Do not compile Tablet support.
1922
 $XIN  -no-tablet ......... Do not compile Tablet support.
1902
 $XIY  -tablet ............ Compile Tablet support.
1923
 $XIY  -tablet ............ Compile Tablet support.
1903
			 Requires IRIX with wacom.h and libXi or
1924
			 Requires IRIX with wacom.h and libXi or
Lines 2731-2736 if [ "$CFG_LARGEFILE" = "yes" ]; then Link Here
2731
    fi
2752
    fi
2732
fi
2753
fi
2733
2754
2755
if [ "$CFG_XCURSOR" = "yes" ]; then
2756
    echo "#define QT_USE_APPROXIMATE_CURSORS">>$outpath/include/qconfig.h.new
2757
fi
2758
2734
if [ -n "$QCONFIG_FLAGS" ]; then
2759
if [ -n "$QCONFIG_FLAGS" ]; then
2735
    for cfg in $QCONFIG_FLAGS; do
2760
    for cfg in $QCONFIG_FLAGS; do
2736
2761
Lines 2901-2906 if [ "$PLATFORM_X11" = "yes" ]; then Link Here
2901
    echo "Tablet support ...... $CFG_TABLET"
2926
    echo "Tablet support ...... $CFG_TABLET"
2902
    echo "XRender support ..... $CFG_XRENDER"
2927
    echo "XRender support ..... $CFG_XRENDER"
2903
    echo "Xft support ......... $CFG_FREETYPE"
2928
    echo "Xft support ......... $CFG_FREETYPE"
2929
    echo "XCursor support ..... $CFG_XCURSOR"
2904
    echo "XKB Support ......... $CFG_XKB"
2930
    echo "XKB Support ......... $CFG_XKB"
2905
fi
2931
fi
2906
2932

Return to bug 15265