Changes: Smart detection of moc path

RevBy: Tomas
Details:
Adapts the mmoc script to better detect the path to the moc
executables. It adds the cases where QTDIR is defined but moc is not installed
in that path (happens on fedora 12 with qt3 installed but not qt3-devel), and
the case where the moc executable is named qt4, which is the case on various
popular Linux distributions.

1 files changed, 33 insertions, 12 deletions

diff --git a/mmoc/mmoc b/mmoc/mmoc
index 2f0c0a8d..98737a56 100755
--- a/mmoc/mmoc
+++ b/mmoc/mmoc
@@ -2,24 +2,45 @@
 
 use English;
 
-if ($ENV{"QTDIR"})
-{
-    $::QT_MOC_PATH = "$ENV{\"QTDIR\"}/bin/moc";
-}
-else
-{
-    $::QT_MOC_PATH = "moc";
-    # here we need to do things differently for windows
-    if ( "MSWin32" != "$OSNAME" )
-    {
-	$::QT_MOC_PATH = `which moc`;
-    }
+$::QT_MOC_PATH = find_moc ();
+
+if (! -x $::QT_MOC_PATH) {
+	print "Unable to find moc, or is not executable\n";
+	exit (1);
 }
 
 chomp( $::QT_MOC_PATH );
 
 exit main( @ARGV );
 
+sub find_moc
+{
+	my $mocpath;
+
+	if ($ENV{"QTDIR"} && -x "$ENV{\"QTDIR\"}/bin/moc")
+	{
+		return "$ENV{\"QTDIR\"}/bin/moc";
+	}
+
+    # here we need to do things differently for windows
+    if ( "MSWin32" ne "$OSNAME" )
+    {
+		$mocpath = `which moc 2>/dev/null`;
+		if ($? == 0) {
+			chomp $mocpath;
+			return $mocpath;
+		}
+
+		$mocpath = `which moc-qt4 2>/dev/null`;
+		if ($? == 0) {
+			chomp $mocpath;
+			return $mocpath;
+		}
+    } else {
+		return "moc";
+	}
+}
+
 sub main
 {
     my @argv = @_;