Attachment #542894 for bug #658534




    func=$4
    shift 4
    disable $cfg
    check_cmd $pkg_config --version
    err=$?
    if test "$err" = 0; then
        backup_cflags=$CFLAGS
        temp_extralibs=$($pkg_config --libs $pkg)
        add_cflags $($pkg_config --cflags $pkg)
        check_lib "$@" $header $func $temp_extralibs && enable $cfg
        CFLAGS=$backup_cflags
    fi

enabled pic && enable_weak_pic

is_qmake5(){
    $1 --version 2>&1 | egrep -q -e 'Qt version 5\.(([1-9][0-9]+)|[2-9])\.[0-9]'
}

# qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake

EOF
done

check_foo_config freetype2 freetype2 ft2build.h FT_Init_FreeType

enabled freetype2 ||
    die "ERROR! You must have FreeType installed to compile MythTV."

Lines 154-160 Link Here

(-)a/libs/libmythbase/libmythbase.pro (-1 / +1 lines)
154		154
155	QT += xml sql network	155	QT += xml sql network
156		156
157	contains(QT_VERSION, ^5\\.[0-9]\\..*) {	157	contains(QT_VERSION, ^5\\.[0-9]+\\..*) {
158	QT += widgets	158	QT += widgets
159	}	159	}
160		160

Return to bug 658534

Lines 1592-1603 Link Here

(-)a/configure (-5 / +5 lines)
1592	func=$4	1592	func=$4
1593	shift 4	1593	shift 4
1594	disable $cfg	1594	disable $cfg
1595	check_cmd ${pkg}-config --version	1595	check_cmd $pkg_config --version
1596	err=$?	1596	err=$?
1597	if test "$err" = 0; then	1597	if test "$err" = 0; then
1598	backup_cflags=$CFLAGS	1598	backup_cflags=$CFLAGS
1599	temp_extralibs=$(${pkg}-config --libs)	1599	temp_extralibs=$($pkg_config --libs $pkg)
1600	add_cflags $(${pkg}-config --cflags)	1600	add_cflags $($pkg_config --cflags $pkg)
1601	check_lib "$@" $header $func $temp_extralibs && enable $cfg	1601	check_lib "$@" $header $func $temp_extralibs && enable $cfg
1602	CFLAGS=$backup_cflags	1602	CFLAGS=$backup_cflags
1603	fi	1603	fi
Lines 5907-5913 Link Here
5907	enabled pic && enable_weak_pic	5907	enabled pic && enable_weak_pic
5908		5908
5909	is_qmake5(){	5909	is_qmake5(){
5910	$1 --version 2>&1 \| egrep -q -e "Qt version 5\.[2-9]\.[0-9]"	5910	$1 --version 2>&1 \| egrep -q -e 'Qt version 5\.(([1-9][0-9]+)\|[2-9])\.[0-9]'
5911	}	5911	}
5912		5912
5913	# qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake	5913	# qmake-qt5 /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake
Lines 6902-6908 Link Here
6902	EOF	6902	EOF
6903	done	6903	done
6904		6904
6905	check_foo_config freetype2 freetype ft2build.h FT_Init_FreeType	6905	check_foo_config freetype2 freetype2 ft2build.h FT_Init_FreeType
6906		6906
6907	enabled freetype2 \|\|	6907	enabled freetype2 \|\|
6908	die "ERROR! You must have FreeType installed to compile MythTV."	6908	die "ERROR! You must have FreeType installed to compile MythTV."