diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-27 20:55:12 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-27 20:55:12 -0600 |
| commit | 992df30f3c50b5439c2b5f8621ab6e928d9346eb (patch) | |
| tree | acdd3b48b9f30eeda4f94092172ffb3042fca766 /configure | |
| parent | 74ce99a42a0dc9d9a168156a2f5d146edb9bb555 (diff) | |
| parent | 84f70969d95344d402d6f6152a6373469a3718ca (diff) | |
| download | tqt3-992df30f3c50b5439c2b5f8621ab6e928d9346eb.tar.gz tqt3-992df30f3c50b5439c2b5f8621ab6e928d9346eb.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 31 |
1 files changed, 29 insertions, 2 deletions
@@ -143,6 +143,8 @@ CFG_USER_BUILD_KEY= CFG_ACCESSIBILITY=auto CFG_DLOPEN_OPENGL=no CFG_ENDIAN=auto +CFG_GLIBMAINLOOP=no +CFG_LIBGLIBMAINLOOP= D_FLAGS= I_FLAGS= L_FLAGS= @@ -224,7 +226,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-xshape|-tablet|-pch|-stl|-ipv6|-freetype|-big-codecs|-xcursor|-xrandr|-xrender|-xft|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-version-script|-dlopen-opengl) + -incremental|-qvfb|-profile|-shared|-static|-sm|-thread|-xinerama|-xshape|-tablet|-pch|-stl|-ipv6|-freetype|-big-codecs|-xcursor|-xrandr|-xrender|-xft|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-version-script|-dlopen-opengl|-glibmainloop) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -729,6 +731,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + glibmainloop) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_GLIBMAINLOOP="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; nis) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_NIS="$VAL" @@ -2153,7 +2162,7 @@ Qt/X11 only: $IXN -no-inputmethod-ext Do not compile more immodule extensions support. $IXY -inputmethod-ext ... Compile more immodule extensions support. - (breaks ABI with standard Qt3). + (breaks ABI with standard TQt3). EOF fi @@ -2627,6 +2636,19 @@ if [ "$CFG_PNG" = "no" ]; then elif [ "$CFG_PNG" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG png" fi +if [ "$CFG_GLIBMAINLOOP" = "no" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG no-glibmainloop" +elif [ "$CFG_GLIBMAINLOOP" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG glibmainloop" + + GLIB_CFLAGS="`pkg-config --cflags glib-2.0`" + QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS_GLIB=$GLIB_CFLAGS\"" + + GLIB_LINKFLAG="`pkg-config --libs glib-2.0`" + QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_GLIB=$GLIB_LINKFLAG\"" + + +fi if [ "$CFG_GIF" = "no" ]; then QMAKE_CONFIG="$QMAKE_CONFIG no-gif" elif [ "$CFG_GIF" = "yes" ]; then @@ -3192,6 +3214,11 @@ if [ "$CFG_PNG" = "no" ]; then else echo "PNG support ......... $CFG_PNG ($CFG_LIBPNG)" fi +if [ "$CFG_GLIBMAINLOOP" = "no" ]; then + echo "Glib main loop support ......... $CFG_GLIBMAINLOOP" +else + echo "Glib main loop support ......... $CFG_GLIBMAINLOOP ($CFG_LIBGLIBMAINLOOP)" +fi echo "zlib support ........ $CFG_ZLIB" if [ "$PLATFORM_QWS" = "yes" ]; then echo "Embedded support .... $CFG_EMBEDDED" |