find all tools in same dir as moc; refs #40
This commit is contained in:
		
							
								
								
									
										22
									
								
								configure.in
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								configure.in
									
									
									
									
									
								
							| @@ -180,21 +180,29 @@ else | ||||
|   AC_ARG_WITH([moc], | ||||
|              AC_HELP_STRING([--with-moc=/path/to/moc], | ||||
|                             [to specify the path to qt moc.]), | ||||
|              [MOC="$withval"], | ||||
|              [MOC=""]) | ||||
|   AC_CHECK_PROGS([MOC], [$MOC moc moc-qt4 moc-mac]) | ||||
|              [MOC="$withval" | ||||
|               RCC="$(dirname $withval")/rcc" | ||||
|               UIC="$(dirname $withval")/uic" | ||||
|               LRELEASE="$(dirname $withval")/lrelease" | ||||
|               LUPDATE="$(dirname $withval")/lupdate"], | ||||
|              [MOC="" | ||||
|               RCC="" | ||||
|               UIC="" | ||||
|               LRELEASE="" | ||||
|               LUPDATE=""]) | ||||
|   AC_CHECK_PROGS([MOC], ["$MOC" moc moc-qt4 moc-mac]) | ||||
|   test -n "$MOC" || AC_MSG_ERROR([moc for Qt not found!]) | ||||
|   AC_SUBST(MOC) | ||||
|   AC_CHECK_PROGS([RCC], [$(dirname $MOC)/rcc rcc rcc-qt4 rcc-mac]) | ||||
|   AC_CHECK_PROGS([RCC], ["$RCC" rcc rcc-qt4 rcc-mac]) | ||||
|   test -n "$RCC" || AC_MSG_ERROR([rcc for Qt not found!]) | ||||
|   AC_SUBST(RCC) | ||||
|   AC_CHECK_PROGS([UIC], [$(dirname $MOC)/uic uic uic-qt4 uic-mac]) | ||||
|   AC_CHECK_PROGS([UIC], ["$UIC" uic uic-qt4 uic-mac]) | ||||
|   test -n "$UIC" || AC_MSG_ERROR([uic for Qt not found!]) | ||||
|   AC_SUBST(UIC) | ||||
|   AC_CHECK_PROGS([LRELEASE], [$(dirname $MOC)/lrelease lrelease lrelease-qt4 lrelease-mac]) | ||||
|   AC_CHECK_PROGS([LRELEASE], ["$LRELEASE" lrelease lrelease-qt4 lrelease-mac]) | ||||
|   test -n "$LRELEASE" || AC_MSG_ERROR([lrelease for Qt not found!]) | ||||
|   AC_SUBST(LRELEASE) | ||||
|   AC_CHECK_PROGS([LUPDATE], [$(dirname $MOC)/lupdate lupdate lupdate-qt4 lupdate-mac]) | ||||
|   AC_CHECK_PROGS([LUPDATE], ["$LUPDATE" lupdate lupdate-qt4 lupdate-mac]) | ||||
|   test -n "$LUPDATE" || AC_MSG_ERROR([lupdate for Qt not found!]) | ||||
|   AC_SUBST(LUPDATE) | ||||
|   AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete]) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user