diff options
| author | Miroslav Safr <miroslav.safr@tieto.com> | 2010-12-21 17:20:17 +0200 |
|---|---|---|
| committer | Miroslav Safr <miroslav.safr@tieto.com> | 2011-01-05 11:06:13 +0200 |
| commit | a29c65697b55946ceb62694153b8625158aceb3b (patch) | |
| tree | 5c94f1f08d4f2822bf4625d27f8b970768283d87 | |
| parent | 85bc871cb3554cb6fdf829f8c08b4a25850b0dcb (diff) | |
Changes: Information about configure options is needed in application build
RevBy:Sergiy
Details: In case of QtDbus we need to know if we enabled it or not when we build libmeegotouch
In meegotouch_common.prf when we are linking some application with libmeegotouch DEFINES from application are already configured different way than DEFINES from library build.
This is just one way. I think there could be some nicer way but at least we have the libmeegotouch "configuration" stored for later use/check.
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mkspecs/features/meegotouch_common.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/meegotouch_defines.prf.in | 4 |
3 files changed, 7 insertions, 2 deletions
@@ -705,6 +705,7 @@ cat "$relpath/mkspecs/features/meegotouch_defines.prf.in" \ | sed -e "s,@@M_UNIX_INSTALL_PREFIX@@,$M_INSTALL_PREFIX,g" \ | sed -e "s,@@M_UNIX_INSTALL_SYSCONFDIR@@,$M_INSTALL_SYSCONFDIR,g" \ | sed -e "s,@@M_UNIX_INSTALL_LIBDIR@@,$M_INSTALL_LIBDIR,g" \ +| sed -e "s,@@MEEGOTOUCHCONFIG_DEPS@@,$MEEGOTOUCHCONFIG_DEPS,g" \ > "$MEEGOTOUCH_DEFINES_PRF.tmp" # replace meegotouch_defines.prf if it differs from the newly created temp file diff --git a/mkspecs/features/meegotouch_common.prf b/mkspecs/features/meegotouch_common.prf index 12e3ca32..ce31b2f4 100644 --- a/mkspecs/features/meegotouch_common.prf +++ b/mkspecs/features/meegotouch_common.prf @@ -2,8 +2,8 @@ include(meegotouch_defines.prf) include(meegotouch_mgen.prf) include(meegotouch_mmoc.prf) -contains(DEFINES, HAVE_DBUS) { - QT += dbus +contains(MEEGOTOUCHCONFIG_DEPS, HAVE_DBUS) { + QT *= dbus } macx { diff --git a/mkspecs/features/meegotouch_defines.prf.in b/mkspecs/features/meegotouch_defines.prf.in index 631c76cc..89d702fe 100644 --- a/mkspecs/features/meegotouch_defines.prf.in +++ b/mkspecs/features/meegotouch_defines.prf.in @@ -11,6 +11,10 @@ M_VERSION=$${M_MAJOR_VERSION}.$${M_MINOR_VERSION}.$${M_PATCH_VERSION} # first set default value for meegotouch prefix # the @@...@@ variable is filled from the libmeegotouch/configure script. + +#info how the libmeegotouch was configured +MEEGOTOUCHCONFIG_DEPS = @@MEEGOTOUCHCONFIG_DEPS@@ + unix { M_PREFIX = @@M_UNIX_INSTALL_PREFIX@@ M_SYSCONFDIR = @@M_UNIX_INSTALL_SYSCONFDIR@@ |