designer widgets removed - has completely changed in qt5
This commit is contained in:
Marc Wäckerlin
129
ax_check_qt.m4
129
ax_check_qt.m4
@@ -1,16 +1,16 @@
|
||||
# SYNOPSIS
|
||||
#
|
||||
# Check if a module exists:
|
||||
# AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||
# AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||
#
|
||||
# Abort if a module does not exist:
|
||||
# AX_CXX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||
# AX_REQUIRE_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||
#
|
||||
# DESCRIPTIONS
|
||||
#
|
||||
# qt_prefix
|
||||
#
|
||||
# Each call to AX_CXX_CHECK_QT should have a different prefix
|
||||
# Each call to AX_CHECK_QT should have a different prefix
|
||||
# value (with a few exceptions discussed later on). This value,
|
||||
# usually provided in uppercase, is used as prefix to the
|
||||
# variables holding the compiler flags and libraries reported by
|
||||
@@ -38,24 +38,31 @@
|
||||
|
||||
|
||||
AC_DEFUN([AX_CXX_QT_TOOL], [
|
||||
PKG_PROG_PKG_CONFIG
|
||||
if test -z "$HAVE_$1"; then
|
||||
HAVE_$1=1
|
||||
AC_MSG_CHECKING([for $2])
|
||||
AC_ARG_VAR([$1], [path to Qt tool $2])
|
||||
$1=${$1:-$(pkg-config --variable=$2_location Qt5Core)}
|
||||
$1=${$1:-$(pkg-config --variable=host_bins Qt5Core)/$2}
|
||||
$1=${$1:-$(pkg-config --variable=$2_location QtCore)}
|
||||
$1=${$1:-$(pkg-config --variable=host_bins QtCore)/$2}
|
||||
$1=${$1:-$(${PKG_CONFIG} --variable=$2_location Qt5Core)}
|
||||
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2-qt5}
|
||||
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2}
|
||||
$1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)}
|
||||
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2}
|
||||
$1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2-qt4}
|
||||
if ! which "${$1%% *}" > /dev/null; then
|
||||
if which "$2" > /dev/null; then
|
||||
if which "$2-qt5" > /dev/null; then
|
||||
$1=$2-qt5
|
||||
elif which "$2" > /dev/null; then
|
||||
$1=$2
|
||||
elif which "$2-qt4" > /dev/null; then
|
||||
$1=$2-qt4
|
||||
else
|
||||
HAVE_$1=0
|
||||
$1=""
|
||||
fi
|
||||
fi
|
||||
AC_SUBST($1)
|
||||
AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
|
||||
AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1)
|
||||
if test $HAVE_$1 -eq 1; then
|
||||
AC_MSG_RESULT([$$1])
|
||||
else
|
||||
@@ -73,24 +80,6 @@ AC_DEFUN([AX_CXX_QT_TOOLS], [
|
||||
AX_CXX_QT_TOOL(LRELEASE, lrelease)
|
||||
])
|
||||
|
||||
AC_DEFUN([AX_CHECK_VALID_FLAG], [
|
||||
AC_MSG_CHECKING([m4_default([$2], [for valid flag in "$1"])])
|
||||
save_cxxflags="$CXXFLAGS"
|
||||
newflag="no"
|
||||
for test_flag in $1; do
|
||||
CXXFLAGS+=" ${test_flag}"
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
|
||||
newflag="$test_flag"
|
||||
AM_CXXFLAGS+=" ${test_flag}"
|
||||
CXXFLAGS="$save_cxxflags"
|
||||
break;
|
||||
])
|
||||
CXXFLAGS="$save_cxxflags"
|
||||
done
|
||||
AC_SUBST(AM_CXXFLAGS)
|
||||
AC_MSG_RESULT([$newflag])
|
||||
])
|
||||
|
||||
AC_DEFUN([AX_CHECK_QT], [
|
||||
qt_modules="$2"
|
||||
qt_modules_optional="$3"
|
||||
@@ -100,28 +89,20 @@ AC_DEFUN([AX_CHECK_QT], [
|
||||
PKG_CHECK_MODULES([$1]5, [${qt_modules//Qt/Qt5}], [
|
||||
HAVE_$1=1
|
||||
AC_DEFINE([HAVE_$1])
|
||||
AM_CPPFLAGS+=" ${[$1]5_CFLAGS}"
|
||||
QTDIR=$(${PKG_CONFIG} --variable=prefix Qt5Core)
|
||||
QT_PLUGIN_PATH=${QTDIR}/share/qt5/plugins
|
||||
CPPFLAGS+=" ${[$1]5_CFLAGS}"
|
||||
MOC_FLAGS+=" -DHAVE_$1=1 ${[$1]5_CFLAGS}"
|
||||
AM_CXXFLAGS+=" ${[$1]5_CFLAGS}"
|
||||
CXXFLAGS+=" ${[$1]5_CFLAGS}"
|
||||
LIBS+=" ${[$1]5_LIBS}"
|
||||
modules=${qt_modules//Qt/Qt5}
|
||||
if test -z "$PKG_REQUIREMENTS"; then
|
||||
PKG_REQUIREMENTS="${modules// /, }"
|
||||
else
|
||||
PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }"
|
||||
fi
|
||||
PKG_REQUIREMENTS+=" ${qt_modules//Qt/Qt5}"
|
||||
if test -n "${qt_modules_optional}"; then
|
||||
PKG_CHECK_MODULES([$1]5_OPTIONAL, [${qt_modules_optional//Qt/Qt5}], [
|
||||
AM_CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
|
||||
CPPFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
|
||||
MOC_FLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
|
||||
AM_CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
|
||||
CXXFLAGS+=" ${[$1]5_OPTIONAL_CFLAGS}"
|
||||
LIBS+=" ${[$1]5_OPTIONAL_LIBS}"
|
||||
modules=${qt_modules_optional//Qt/Qt5}
|
||||
if test -z "$PKG_REQUIREMENTS"; then
|
||||
PKG_REQUIREMENTS="${modules// /, }"
|
||||
else
|
||||
PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }"
|
||||
fi
|
||||
PKG_REQUIREMENTS+=" ${qt_modules_optional//Qt/Qt5}"
|
||||
], [
|
||||
AC_MSG_NOTICE([Not found: ${qt_modules_optional//Qt/Qt5}])
|
||||
])
|
||||
@@ -130,41 +111,41 @@ AC_DEFUN([AX_CHECK_QT], [
|
||||
PKG_CHECK_MODULES([$1], [${qt_modules}], [
|
||||
HAVE_$1=1
|
||||
AC_DEFINE([HAVE_$1])
|
||||
AM_CPPFLAGS+=" ${$1_CFLAGS}"
|
||||
QTDIR=$(${PKG_CONFIG} --variable=prefix QtCore)
|
||||
QT_PLUGIN_PATH=${QTDIR}/share/qt/plugins
|
||||
CPPFLAGS+=" ${$1_CFLAGS}"
|
||||
MOC_FLAGS+=" -DHAVE_$1=1 ${$1_CFLAGS}"
|
||||
AM_CXXFLAGS+=" ${$1_CFLAGS}"
|
||||
CXXFLAGS+=" ${$1_CFLAGS}"
|
||||
LIBS+=" ${$1_LIBS}"
|
||||
modules=${qt_modules}
|
||||
if test -z "$PKG_REQUIREMENTS"; then
|
||||
PKG_REQUIREMENTS="${modules// /, }"
|
||||
else
|
||||
PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }"
|
||||
fi
|
||||
PKG_REQUIREMENTS+=" ${qt_modules}"
|
||||
if test -n "$3"; then
|
||||
PKG_CHECK_MODULES($1_OPTIONAL, [${qt_modules_optional}], [
|
||||
AM_CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
|
||||
CPPFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
|
||||
MOC_FLAGS+=" ${$1_OPTIONAL_CFLAGS}"
|
||||
AM_CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
|
||||
CXXFLAGS+=" ${$1_OPTIONAL_CFLAGS}"
|
||||
LIBS+=" ${$1_OPTIONAL_LIBS}"
|
||||
modules=${qt_modules_optional}
|
||||
if test -z "$PKG_REQUIREMENTS"; then
|
||||
PKG_REQUIREMENTS="${modules// /, }"
|
||||
else
|
||||
PKG_REQUIREMENTS="${PKG_REQUIREMENTS}, ${modules// /, }"
|
||||
fi
|
||||
PKG_REQUIREMENTS+=" ${qt_modules_optional}"
|
||||
], [
|
||||
AC_MSG_NOTICE([Not found: ${qt_modules_optional}])
|
||||
])
|
||||
fi
|
||||
], [HAVE_$1=0])
|
||||
])
|
||||
AM_CONDITIONAL(HAVE_$1, test $HAVE_$1 -eq 1)
|
||||
AX_CHECK_VALID_FLAG([-fPIC -fPIE], [position independent code flag])
|
||||
AC_SUBST(AM_CPPFLAGS)
|
||||
AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1)
|
||||
AX_CHECK_VALID_CXX_FLAG([-fPIC -fPIE], [position independent code flag])
|
||||
if test "${MINGW}" != "no"; then
|
||||
AX_CHECK_VALID_CXX_FLAG([-Wl,-subsystem,windows], [windows console flag])
|
||||
fi
|
||||
AC_SUBST(QTDIR)
|
||||
AC_SUBST(QT_PLUGIN_PATH)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
AC_SUBST(MOC_FLAGS)
|
||||
AC_SUBST(AM_CXXFLAGS)
|
||||
AC_SUBST(CXXFLAGS)
|
||||
AC_SUBST(PKG_REQUIREMENTS)
|
||||
AX_ADDITIONAL_QT_RULES_HACK='
|
||||
|
||||
LANGUAGE_FILE_BASE ?= translations
|
||||
|
||||
ui_%.hxx: %.ui
|
||||
$(UIC) -o [$][@] $<
|
||||
|
||||
@@ -172,19 +153,31 @@ moc_%.cxx: %.hxx
|
||||
$(MOC) $(MOC_FLAGS) -o [$][@] $<
|
||||
|
||||
qrc_%.cxx: %.qrc
|
||||
$(RCC) -o [$][@] $<'
|
||||
$(RCC) -o [$][@] -name ${<:%.qrc=%} $<
|
||||
AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK)
|
||||
])
|
||||
|
||||
#%.qrc: %
|
||||
# cwd=$$(pwd) && cd $< && $(RCC) -project -o $${cwd}/[$][@]
|
||||
|
||||
%.qm: %.ts
|
||||
${LRELEASE} $< -qm [$][@]
|
||||
|
||||
#%.ts: ${LANGUAGE_FILES}
|
||||
# ${LUPDATE} -no-obsolete \
|
||||
# -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \
|
||||
# -ts [$][@] $<
|
||||
|
||||
'])
|
||||
|
||||
# SYNOPSIS
|
||||
#
|
||||
# AX_CXX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||
# AX_CHECK_QT([qt_prefix], [list-of-qt-modules], [optional-modules])
|
||||
#
|
||||
# DESCRIPTIONS
|
||||
#
|
||||
# qt_prefix
|
||||
#
|
||||
# Each call to AX_CXX_CHECK_QT should have a different prefix
|
||||
# Each call to AX_CHECK_QT should have a different prefix
|
||||
# value (with a few exceptions discussed later on). This value,
|
||||
# usually provided in uppercase, is used as prefix to the
|
||||
# variables holding the compiler flags and libraries reported by
|
||||
@@ -222,5 +215,5 @@ AC_DEFUN([AX_REQUIRE_QT], [
|
||||
# AX_QT_NO_KEYWORDS
|
||||
|
||||
AC_DEFUN([AX_QT_NO_KEYWORDS], [
|
||||
AM_CPPFLAGS+=" -DQT_NO_KEYWORDS"
|
||||
CPPFLAGS+=" -DQT_NO_KEYWORDS"
|
||||
])
|
||||
|
||||
Reference in New Issue
Block a user