Revert "Fixes: NB#171747 - mmoc native binary does not work with qemu - causes build failures"

This reverts commit 7c274d807830f9b5c19829b8a96476edc6a3a35d.
Break out-of-source build (i.e. debian packaging)

1 files changed, 2 insertions, 17 deletions

diff --git a/configure b/configure
index ee34ab09..cf1b3292 100755
--- a/configure
+++ b/configure
@@ -75,11 +75,9 @@ HAVE_GSTREAMER=no
 HAVE_DBUS=no
 HAVE_CONTENTACTION=no
 HAVE_N900=no
-
+   
 OPT_SHADOW=maybe
 
-IS_ARMEL=no
-   
 # initalize variables used for installation
 M_INSTALL_PREFIX=/usr/local
 M_INSTALL_SYSCONFDIR=/etc
@@ -402,10 +400,6 @@ if [ $? -eq 0 ]; then
 	HAVE_CONTENTACTION=no
     fi
 
-    if [ $SBOX_UNAME_MACHINE = "arm" ]; then
-        IS_ARMEL=yes
-    fi
-
 fi
 
 
@@ -555,10 +549,6 @@ if [ "$HAVE_N900" = "yes" ]; then
     MEEGOTOUCHCONFIG_DEPS="$MEEGOTOUCHCONFIG_DEPS HAVE_N900"
 fi
 
-if [ "$IS_ARMEL" = "yes" ]; then
-    MEEGOTOUCHCONFIG_DEPS="$MEEGOTOUCHCONFIG_DEPS IS_ARMEL"
-fi                               
-
 
 cat >>"$MEEGOTOUCHCONFIG.tmp" <<EOF
 # Autogenerated by configure script
@@ -608,10 +598,6 @@ else
     mv -f "$M_QMAKE_CACHE.tmp" "$M_QMAKE_CACHE"
 fi
 
-M_MMOC_EXECUTABLE="mmoc"
-if [ "$IS_ARMEL" = "yes" ]; then
-    M_MMOC_EXECUTABLE="mmoc.pl"
-fi
 
 MEEGOTOUCH_DEFINES_PRF="$outpath/mkspecs/features/meegotouch_defines.prf"
 
@@ -620,8 +606,7 @@ MEEGOTOUCH_DEFINES_PRF="$outpath/mkspecs/features/meegotouch_defines.prf"
 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,@@M_MMOC_EXECUTABLE@@,$M_MMOC_EXECUTABLE,g" > "$MEEGOTOUCH_DEFINES_PRF.tmp"
+| sed -e "s,@@M_UNIX_INSTALL_LIBDIR@@,$M_INSTALL_LIBDIR,g" > "$MEEGOTOUCH_DEFINES_PRF.tmp"
 
 # replace meegotouch_defines.prf if it differs from the newly created temp file
 if cmp -s "$MEEGOTOUCH_DEFINES_PRF.tmp" "$MEEGOTOUCH_DEFINES_PRF"; then