Renamed --enable-qte switch for Qt Embedded interface support to --enable-opie.

Reused --enable-qte for Video Out support under Qt Embedded.

diff --git a/Makefile.opts.in b/Makefile.opts.in
index c96d7c11b92027a84812effdb07e3db8f2e2cee5..34ac60ed8699840a3af69a4782c186df4bdce5d6 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -78,6 +78,7 @@ kde_CFLAGS = @kde_CFLAGS@
 mad_CFLAGS = @mad_CFLAGS@
 memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
 motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
+opie_CFLAGS = @opie_CFLAGS@
 ts_dvbpsi_CFLAGS = @ts_dvbpsi_CFLAGS@
 qt_CFLAGS = @qt_CFLAGS@
 qte_CFLAGS = @qte_CFLAGS@
@@ -130,6 +131,7 @@ mad_LDFLAGS = @mad_LDFLAGS@
 memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@
 motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@
 ncurses_LDFLAGS = @ncurses_LDFLAGS@
+opie_LDFLAGS = @opie_LDFLAGS@
 oss_LDFLAGS = @oss_LDFLAGS@
 qnx_LDFLAGS = @qnx_LDFLAGS@
 qt_LDFLAGS = @qt_LDFLAGS@

diff --git a/configure.in b/configure.in
index fa40343e492eebb2b213e92b5f5d9f9aa935e0db..a44e06657a508ca43ebc472c75258057623fdb61 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1380,6 +1380,34 @@ from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day.
   fi
 fi
 
+dnl
+dnl  QT Embedded module
+dnl  (disabled by default)
+dnl
+AC_ARG_ENABLE(qte,
+  [  --enable-qte            QT Embedded support (default disabled)])
+if test "x${enable_qte}" = "xyes"
+then
+  AC_ARG_WITH(qte,
+  [    --with-qte=PATH    Qt Embedded headers and libraries])
+  if test "x${with_qte}" = "x"
+  then
+    test_LDFLAGS="-L${QTDIR}/lib"
+    test_CFLAGS="-I$(QTDIR)/include/qte"
+  else
+    test_LDFLAGS="-L${with_qte}/lib"
+    test_CFLAGS="-I${with_qte}/include/qte"
+  fi
+
+  CPPFLAGS="${save_CPPFLAGS} -I${qte_includes}"
+  AC_CHECK_HEADERS(qte/qte.h, [
+    PLUGINS="${PLUGINS} video_output/qte/qte"
+    qte_CFLAGS ="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
+    qte_LDFLAGS ="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte"
+  ])
+  CPPFLAGS="${save_CPPFLAGS}"
+fi
+
 dnl
 dnl  Windows DirectX module
 dnl
@@ -1743,14 +1771,25 @@ AC_ARG_ENABLE(kde,
    fi])
 
 dnl
-dnl  Qt embedded module
+dnl  Opie QT embedded module
 dnl
-AC_ARG_ENABLE(qte,
-  [  --enable-qte            Qt embedded interface support (default disabled)],
-  [if test "x${enable_qte}" = "xyes"; then
-     PLUGINS="${PLUGINS} gui/qte/qte"
-     qte_LDFLAGS="${qte_LDFLAGS} -lqte -L${QTEDIR}/lib"
-     qte_CFLAGS="${qte_CFLAGS} -I/usr/include/qte -I${QTEDIR}/include"
+AC_ARG_ENABLE(opie,
+  [  --enable-opie           Qt embedded interface support (default disabled)],
+  [if test "x${enable_opie}" = "xyes"; then
+     AC_ARG_WITH(qte,
+     [    --with-qte=PATH    Qt Embedded headers and libraries])
+     if test "x${with_qte}" = "x"
+     then
+       test_LDFLAGS="-L$(QTDIR)/lib"
+       test_CFLAGS="-I${QTDIR}/include/qte"
+     else
+       test_LDFLAGS="-L${with_qte}/lib"
+       test_CFLAGS="-I${with_qte}/include/qte"
+     fi
+
+     PLUGINS="${PLUGINS} gui/opie/opie"
+     opie_LDFLAGS="${opie_LDFLAGS} ${test_LDFLAGS} -lqte"
+     opie_CFLAGS="${opie_CFLAGS} ${test_CFLAGS}"
      if test -x ${QTEDIR}/bin/moc
      then
        MOC=${QTEDIR}/bin/moc
@@ -2098,6 +2137,7 @@ AC_SUBST(gnome_CFLAGS)
 AC_SUBST(gtk_CFLAGS)
 AC_SUBST(gtk_main_CFLAGS)
 AC_SUBST(kde_CFLAGS)
+AC_SUBST(opie_CFLAGS)
 AC_SUBST(idctaltivec_CFLAGS)
 AC_SUBST(macosx_CFLAGS)
 AC_SUBST(mad_CFLAGS)
@@ -2153,6 +2193,7 @@ AC_SUBST(mad_LDFLAGS)
 AC_SUBST(memcpyaltivec_LDFLAGS)
 AC_SUBST(motionaltivec_LDFLAGS)
 AC_SUBST(ncurses_LDFLAGS)
+AC_SUBST(opie_LDFLAGS)
 AC_SUBST(oss_LDFLAGS)
 AC_SUBST(qnx_LDFLAGS)
 AC_SUBST(qt_LDFLAGS)