diff options
| author | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2012-08-23 18:46:35 +0000 |
|---|---|---|
| committer | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2012-08-23 18:46:35 +0000 |
| commit | 9c2e9e45a5c743a93d6039548fa583e8eae04f04 (patch) | |
| tree | 409e81c55d122210a50564c5750ff2fc1f8fc109 | |
| parent | a85553073f2b0b3451f72ecd614740d638562821 (diff) | |
| download | pica-pica-9c2e9e45a5c743a93d6039548fa583e8eae04f04.tar.gz pica-pica-9c2e9e45a5c743a93d6039548fa583e8eae04f04.zip | |
support for moc and uic named as uic-qt4 and moc-qt4
git-svn-id: svn://localhost/project_picapica/trunk@183 fb96df88-216d-11de-830c-f3023f12d8ac
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 9ba1d94..f7b604d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -110,10 +110,10 @@ moc_viewcertdialog.cpp \ ui_mainwindow.h moc_%.cpp: pica-client/%.h - moc $< -o $@ + $(MOC) $< -o $@ moc_%.cpp: pica-client/dialogs/%.h - moc $< -o $@ + $(MOC) $< -o $@ pica-client/mainwindow.cpp: ui_mainwindow.h @@ -121,7 +121,7 @@ pica-client/mainwindow.cpp: ui_mainwindow.h # uic $(CPPFLAGS) $< -o $@ ui_%.h: pica-client/%.ui - uic $(CPPFLAGS) $< -o $@ + $(UIC) $(CPPFLAGS) $< -o $@ pica_client_pica_client_CPPFLAGS = -DPICA_INSTALLPREFIX=\"$(prefix)\" $(QT_DEPENDENCIES_CFLAGS) diff --git a/configure.ac b/configure.ac index 1763a7f..c8b31b2 100644 --- a/configure.ac +++ b/configure.ac @@ -56,11 +56,11 @@ AS_IF([test "x$PICA_CLIENT_ENABLED" = "xyes"],[ PKG_CHECK_MODULES([QT_DEPENDENCIES], [QtCore QtGui QtSql QtNetwork]) AC_SUBST([QT_DEPENDENCIES_CFLAGS]) AC_SUBST([QT_DEPENDENCIES_LIBS]) -AC_CHECK_PROG([UIC], [uic], [yes], [no]) -AC_CHECK_PROG([MOC], [moc], [yes], [no]) +AC_CHECK_PROGS([UIC], [uic uic-qt4], [notfound]) +AC_CHECK_PROGS([MOC], [moc moc-qt4], [notfound]) #fail if not found ... -AS_IF([test "x$UIC" != xyes],[AC_MSG_ERROR(["uic program not found. Please install Qt development package"])]) -AS_IF([test "x$MOC" != xyes],[AC_MSG_ERROR(["moc program not found. Please install Qt development package"])]) +AS_IF([test "x$UIC" = xnotfound],[AC_MSG_ERROR(["uic program not found. Please install Qt development package"])]) +AS_IF([test "x$MOC" = xnotfound],[AC_MSG_ERROR(["moc program not found. Please install Qt development package"])]) #check for xdg-utils AC_CHECK_PROG([XDG_DESKTOP_MENU], [xdg-desktop-menu], [yes], [no]) |