Blob Blame History Raw
diff -up lightdm-1.10.6/configure.ac.qtchooser lightdm-1.10.6/configure.ac
--- lightdm-1.10.6/configure.ac.qtchooser	2015-11-19 21:07:45.000000000 -0600
+++ lightdm-1.10.6/configure.ac	2015-11-25 10:15:58.362197081 -0600
@@ -107,7 +107,7 @@ if test x"$enable_liblightdm_qt4" = "xye
     [compile_liblightdm_qt4=yes
      AC_CHECK_TOOLS(MOC4, [moc-qt4 moc])
      if test x"$(readlink $(which $MOC4))" = xqtchooser; then
-         MOC4="$MOC4 --qt=qt4"
+         MOC4="$MOC4 --qt=4"
      fi
      if test "x$compile_liblightdm_gobject" != xyes; then
          AC_MSG_FAILURE(
@@ -134,9 +134,9 @@ if test x"$enable_liblightdm_qt5" != "xn
         Qt5Gui
     ],
     [compile_liblightdm_qt5=yes
-     AC_CHECK_TOOLS(MOC5, [moc])
+     AC_CHECK_TOOLS(MOC5, [moc-qt5 moc])
      if test x"$(readlink $(which $MOC5))" = xqtchooser; then
-         MOC5="$MOC5 --qt=qt5"
+         MOC5="$MOC5 --qt=5"
      fi
     ],
     [if test "x$enable_liblightdm_qt5" != xauto; then
diff -up lightdm-1.10.6/configure.qtchooser lightdm-1.10.6/configure
--- lightdm-1.10.6/configure.qtchooser	2015-11-19 21:26:56.000000000 -0600
+++ lightdm-1.10.6/configure	2015-11-25 10:15:58.378197158 -0600
@@ -16938,7 +16938,7 @@ esac
 fi
 
      if test x"$(readlink $(which $MOC4))" = xqtchooser; then
-         MOC4="$MOC4 --qt=qt4"
+         MOC4="$MOC4 --qt=4"
      fi
      if test "x$compile_liblightdm_gobject" != xyes; then
          { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -17126,7 +17126,7 @@ fi
 fi
 if test -z "$MOC5"; then
   ac_ct_MOC5=$MOC5
-  for ac_prog in moc
+  for ac_prog in moc-qt5 moc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -17182,7 +17182,7 @@ esac
 fi
 
      if test x"$(readlink $(which $MOC5))" = xqtchooser; then
-         MOC5="$MOC5 --qt=qt5"
+         MOC5="$MOC5 --qt=5"
      fi
 
 fi