set MOC to /usr/bin/moc for debian, because on lucid it would be /usr/bin/moc-qt4, but there is no /usr/bin/rcc-qt4, only /usr/bin/rcc; refs #30
This commit is contained in:
13
configure.in
13
configure.in
@@ -135,6 +135,19 @@ PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network],
|
|||||||
have_qtnetwork=1],
|
have_qtnetwork=1],
|
||||||
[have_qtnetwork=0])])
|
[have_qtnetwork=0])])
|
||||||
AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1")
|
AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1")
|
||||||
|
if test "$have_qt" = "1" \
|
||||||
|
&& ! which "$UIC" "$MOC"; then
|
||||||
|
if test -n "$MOC" && which "${UIC:=${MOC/moc/uic}}"; then
|
||||||
|
AC_MSG_NOTICE([Detected: "$UIC" "$MOC"])
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([Missing QT Programs.
|
||||||
|
- Needed: uic moc
|
||||||
|
- Found: $UIC $MOC
|
||||||
|
You can specify the missing programs by passing one of the variables:
|
||||||
|
\$UIC \$MOC
|
||||||
|
Often it is sufficient to specify MOC=/path/to/moc ./configure)])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
AC_SUBST(UIC)
|
AC_SUBST(UIC)
|
||||||
AC_SUBST(MOC)
|
AC_SUBST(MOC)
|
||||||
|
|
||||||
|
2
debian/rules
vendored
2
debian/rules
vendored
@@ -40,7 +40,7 @@ endif
|
|||||||
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
|
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
|
||||||
cp -f /usr/share/misc/config.guess config.guess
|
cp -f /usr/share/misc/config.guess config.guess
|
||||||
endif
|
endif
|
||||||
CPPFLAGS="${CPPFLAGS} -DALLOW_SSL_0_8 -std=c++0x -I/usr/include/PCSC -I/usr/include/p11-kit-1/p11-kit" CXXFLAGS="-ggdb" LDFLAG="-ggdb" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)"
|
CPPFLAGS="${CPPFLAGS} -DALLOW_SSL_0_8 -std=c++0x -I/usr/include/PCSC -I/usr/include/p11-kit-1/p11-kit" CXXFLAGS="-ggdb" LDFLAG="-ggdb" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" MOC=/usr/bin/moc
|
||||||
# does not work: LDFLAGS="-Wl,-z,defs"
|
# does not work: LDFLAGS="-Wl,-z,defs"
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user