{"thread":{"id":"4303","subject":"[PATCH] Actually support embedded Qt, make configuration code more robust","startedAt":"2006-05-27T02:27:35Z","lastAt":"2006-05-27T06:22:04Z","messageCount":2,"participants":["Pavel Roskin","Marco Costalba"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"20772","messageId":"20060527022735.5879.58043.stgit@dv.roinet.com","threadId":"4303","inReplyTo":null,"subject":"[PATCH] Actually support embedded Qt, make configuration code more robust","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-05-27T02:27:35Z","receivedAt":"2006-05-27T02:27:35Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Add -DQWS and -fno-rtti flags for embedded Qt.\n\nDon't add X11 flags for embedded Qt and threading specific flags for\nnon-multithreaded Qt.\n\nBefore checking for the Qt library, make sure it actually exists in the\nQt library path and not elsewhere.\n\nFix missing \";;\" before \"esac\" (potentially non-portable).\n\nSigned-off-by: Pavel Roskin <proski@gnu.org>\n\nSigned-off-by: Pavel Roskin <proski@gnu.org>\n---\n\n config/gwqt.m4 |   40 ++++++++++++++++++++++++++--------------\n 1 files changed, 26 insertions(+), 14 deletions(-)\n\ndiff --git a/config/gwqt.m4 b/config/gwqt.m4\nindex 78bed1d..cccccfe 100644\n--- a/config/gwqt.m4\n+++ b/config/gwqt.m4\n@@ -91,17 +91,19 @@ fi\n \n # Checking for possible dependencies of the Qt library\n gwqt_save_LDFLAGS=\"$LDFLAGS\"\n-QT_LIBS=\"$X_PRE_LIBS -lX11 $X_EXTRA_LIBS\"\n-AC_CHECK_LIB(pthread, pthread_exit, [QT_LIBS=\"-lpthread $QT_LIBS\"])\n+QT_LIBS_X=\"$X_PRE_LIBS -lX11 $X_EXTRA_LIBS\"\n+AC_CHECK_LIB(pthread, pthread_exit, [QT_LIBS_MT=\"-lpthread $QT_LIBS\"])\n \n LDFLAGS=\"$LDFLAGS $X_LIBS\"\n-AC_CHECK_LIB(Xft, XftFontOpen, [QT_LIBS=\"-lXft $QT_LIBS\"], , [$QT_LIBS])\n+AC_CHECK_LIB(Xft, XftFontOpen, [QT_LIBS_X=\"-lXft $QT_LIBS_X\"], , [$QT_LIBS_X])\n \n \n # Checking for the Qt library\n LDFLAGS=\"$LDFLAGS -L$QTLIBDIR\"\n for i in qt-mt qt qte-mt qte qt-gl; do\n-    AC_CHECK_LIB([$i], Get_Class, [qtlib=\"$i\"; break], , [$QT_LIBS])\n+    set X \"$QTLIBDIR/lib$i.\"*\n+    test \"$[2]\" = \"$QTLIBDIR/lib$i.*\" && continue\n+    AC_CHECK_LIB([$i], main, [qtlib=\"$i\"; break], , [$QT_LIBS_X $QT_LIBS_MT])\n done\n \n if test -z \"$qtlib\"; then\n@@ -110,30 +112,40 @@ fi\n \n LDFLAGS=\"$gwqt_save_LDFLAGS\"\n \n-# Calculate QT_CPPFLAGS\n+# Calculate QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS\n+QT_LIBS=\"-l$qtlib\"\n case \"$qtlib\" in\n-    *-mt) QT_CPPFLAGS=\"-D_REENTRANT -DQT_THREAD_SUPPORT\";;\n+    *-mt)\n+\tQT_CPPFLAGS=\"-D_REENTRANT -DQT_THREAD_SUPPORT\"\n+\tQT_LIBS=\"$QT_LIBS $QT_LIBS_MT\";;\n esac\n \n+case \"$qtlib\" in\n+    qte*)\n+\tQT_CPPFLAGS=\"-DQWS -fno-rtti\";;\n+    *)\n+\tQT_LIBS=\"$QT_LIBS $QT_LIBS_X\"\n+\tQT_LDFLAGS=\"$X_LIBS\";;\n+esac\n+\n+# Add Qt include path\n if test \"$QTINCDIR\" != \"/usr/include\"; then\n     QT_CPPFLAGS=\"-I$QTINCDIR $QT_CPPFLAGS\"\n fi\n-AC_MSG_NOTICE([QT_CPPFLAGS = $QT_CPPFLAGS])\n-AC_SUBST(QT_CPPFLAGS)\n \n-# Calculate QT_LDFLAGS\n-QT_LDFLAGS=\"$X_LIBS\"\n+# Add Qt library path\n case \"$QTLIBDIR\" in\n     /usr/lib) ;;\n     /usr/lib64) ;;\n     /usr/X11R6/lib) ;;\n-    *) QT_LDFLAGS=\"$QT_LDFLAGS -L$QTLIBDIR\";\n+    *) QT_LDFLAGS=\"$QT_LDFLAGS -L$QTLIBDIR\";;\n esac\n+\n+# Report the results\n+AC_MSG_NOTICE([QT_CPPFLAGS = $QT_CPPFLAGS])\n+AC_SUBST(QT_CPPFLAGS)\n AC_MSG_NOTICE([QT_LDFLAGS = $QT_LDFLAGS])\n AC_SUBST(QT_LDFLAGS)\n-\n-# Calculate QT_LIBS\n-QT_LIBS=\"-l$qtlib $QT_LIBS\"\n AC_MSG_NOTICE([QT_LIBS = $QT_LIBS])\n AC_SUBST(QT_LIBS)\n ])\n"},{"id":"20779","messageId":"e5bfff550605262322t70951ba9red00a12e04512aad@mail.gmail.com","threadId":"4303","inReplyTo":"20060527022735.5879.58043.stgit@dv.roinet.com","subject":"Re: [PATCH] Actually support embedded Qt, make configuration code more robust","fromName":"Marco Costalba","fromEmail":"mcostalba@gmail.com","sentAt":"2006-05-27T06:22:04Z","receivedAt":"2006-05-27T06:22:04Z","isPatch":true,"sender":{"key":"mcostalba@gmail.com","avatar":null},"body":"On 5/27/06, Pavel Roskin <proski@gnu.org> wrote:\n> Add -DQWS and -fno-rtti flags for embedded Qt.\n>\n> Don't add X11 flags for embedded Qt and threading specific flags for\n> non-multithreaded Qt.\n>\n> Before checking for the Qt library, make sure it actually exists in the\n> Qt library path and not elsewhere.\n>\n\nThanks, patch applied.\n\nPlease note that qgit public repository has changed. It is now\ngit://git.kernel.org/pub/scm/qgit/qgit.git\n\n   Marco\n"}]}