Commit 00977bfd authored by Jean-Paul Saman's avatar Jean-Paul Saman

Cleanup of headerfile detection for qte video output plugin.

parent 70b5e04e
...@@ -12462,10 +12462,11 @@ fi; ...@@ -12462,10 +12462,11 @@ fi;
test_LDFLAGS="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`" test_LDFLAGS="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`"
test_CFLAGS="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`" test_CFLAGS="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`"
else else
test_LDFLAGS="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'``" test_LDFLAGS="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`"
test_CFLAGS="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'``" test_CFLAGS="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`"
fi fi
CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
ac_cv_qte_headers=yes
for ac_header in qt.h jpeglib.h for ac_header in qt.h jpeglib.h
...@@ -12577,33 +12578,23 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then ...@@ -12577,33 +12578,23 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF _ACEOF
qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -ljpeg -lqte"
PLUGINS="${PLUGINS} qte"
else else
{ { echo "$as_me:$LINENO: error: echo \"Cannot find QT Embedded development headers.\"" >&5
ac_cv_qte_headers=no
{ { echo "$as_me:$LINENO: error: echo \"Cannot find QT Embedded development headers.\"" >&5
echo "$as_me: error: echo \"Cannot find QT Embedded development headers.\"" >&2;} echo "$as_me: error: echo \"Cannot find QT Embedded development headers.\"" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
done done
CPPFLAGS="${save_CPPFLAGS}" if test "x${ac_cv_qte_headers}" = "xyes"
then
# AC_ARG_WITH(qte_system, qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
# [ --with-qte-system=PATH Additional headers and libraries for Qt Embedded. qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -ljpeg -lqte"
# (The usr/lib, usr/include directories)]) PLUGINS="${PLUGINS} qte"
# if test "x${with_qte_system}" != "xno" -a "x${with_qte_system}" != "x" fi
# then
# test_CFLAGS="-I${with_qte_system}/include"
# test_LDFLAGS="-L${with_qte_system}/lib"
# fi
# CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
# AC_CHECK_HEADERS(jpeglib.h, [
# qte_LDFLAGS="${test_LDFLAGS} -ljpeg ${qte_LDFLAGS}"
# ],
# [ AC_MSG_ERROR([echo "Cannot find additional QT Embedded system development headers."]) ] )
CPPFLAGS="${save_CPPFLAGS}" CPPFLAGS="${save_CPPFLAGS}"
fi fi
......
...@@ -1235,16 +1235,21 @@ then ...@@ -1235,16 +1235,21 @@ then
test_LDFLAGS="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`" test_LDFLAGS="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`"
test_CFLAGS="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`" test_CFLAGS="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`"
else else
test_LDFLAGS="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'``" test_LDFLAGS="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`"
test_CFLAGS="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'``" test_CFLAGS="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`"
fi fi
CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
AC_CHECK_HEADERS(qt.h jpeglib.h, [ ac_cv_qte_headers=yes
AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
ac_cv_qte_headers=no
AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
] )
if test "x${ac_cv_qte_headers}" = "xyes"
then
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} -ljpeg -lqte" qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -ljpeg -lqte"
PLUGINS="${PLUGINS} qte" PLUGINS="${PLUGINS} qte"
], fi
[ AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) ] )
CPPFLAGS="${save_CPPFLAGS}" CPPFLAGS="${save_CPPFLAGS}"
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