Commit 5019f45d authored by Jean-Paul Saman's avatar Jean-Paul Saman

Fix detection of QT Embedded development headers.

parent 9d2e4900
This diff is collapsed.
...@@ -1226,11 +1226,11 @@ dnl (disabled by default) ...@@ -1226,11 +1226,11 @@ dnl (disabled by default)
dnl dnl
AC_ARG_ENABLE(qte, AC_ARG_ENABLE(qte,
[ --enable-qte QT Embedded support (default disabled)]) [ --enable-qte QT Embedded support (default disabled)])
if test "x${enable_qte}" != "xno" if test "x${enable_qte}" = "xyes"
then then
AC_ARG_WITH(qte, AC_ARG_WITH(qte,
[ --with-qte=PATH Qt Embedded headers and libraries]) [ --with-qte=PATH Qt Embedded headers and libraries])
if test "x${with_qte}" = "x" if test "x${with_qte}" = "xyes" -a "x${with_qte}" != "x"
then then
test_LDFLAGS="-L${QTDIR}/lib" test_LDFLAGS="-L${QTDIR}/lib"
test_CFLAGS="-I${QTDIR}/include" test_CFLAGS="-I${QTDIR}/include"
...@@ -1240,16 +1240,12 @@ then ...@@ -1240,16 +1240,12 @@ then
fi fi
CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
AC_CHECK_HEADERS(qt.h, [ AC_CHECK_HEADERS(qte.h, [
qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte" qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte"
if test "x${with_qte}" = "x" PLUGINS="${PLUGINS} qte"
then ],
PLUGINS="${PLUGINS} qte" [ AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) ] )
else
BUILTINS="${BUILTINS} qte"
fi
])
CPPFLAGS="${save_CPPFLAGS}" CPPFLAGS="${save_CPPFLAGS}"
fi fi
...@@ -1650,15 +1646,28 @@ AC_ARG_ENABLE(opie, ...@@ -1650,15 +1646,28 @@ AC_ARG_ENABLE(opie,
test_LDFLAGS="-L${with_qte}/lib" test_LDFLAGS="-L${with_qte}/lib"
test_CFLAGS="-I${with_qte}/include" test_CFLAGS="-I${with_qte}/include"
fi fi
ac_cv_qte_headers=yes
PLUGINS="${PLUGINS} opie" CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
opie_LDFLAGS="${opie_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte" AC_CHECK_HEADERS(qte.h, [
opie_CFLAGS="${opie_CFLAGS} ${test_CFLAGS}-DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" test_CFLAGS="${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
if test -x ${QTDIR}/bin/moc test_LDFLAGS="${test_LDFLAGS} -lqpe -lqte"
],
[ ac_cv_qte_headers=no
AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
]
)
CPPFLAGS="${save_CPPFLAGS}"
if test x${ac_cv_qte_headers} = "xyes"
then then
MOC=${QTDIR}/bin/moc PLUGINS="${PLUGINS} opie"
else opie_LDFLAGS="${opie_LDFLAGS} ${test_LDFLAGS}"
MOC=moc opie_CFLAGS="${opie_CFLAGS} ${test_CFLAGS}"
if test -x ${QTDIR}/bin/moc
then
MOC=${QTDIR}/bin/moc
else
MOC=moc
fi
fi fi
fi]) fi])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment