luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix compilation issue under Ubuntu by setting QT_SELECT to qt5

Browse source
This commit is contained in:
Christophe Grenier 2016-11-13 18:29:40 +01:00
parent f56ab1bdb2
commit 96469ca649
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -898,6 +898,7 @@ AC_CHECK_FUNCS([reiserfs_fs_open_fast])
LIBS="$OLDLIBS"
AC_CHECK_FUNCS([ntfs_libntfs_version ntfs_volume_startup])
export QT_SELECT=qt5
if test "$use_qt" = "true";
then
PKG_CHECK_MODULES(QTGUI, [Qt5Gui >= 5.0.0],,use_qt=false)
@ -989,6 +990,7 @@ AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(MOC)
AC_SUBST(LRELEASE)
AC_SUBST(QT_SELECT)
AC_SUBST(fidentify_LDADD)
AC_SUBST(testdisk_LDADD)
AC_SUBST(photorec_LDADD)

8
src/Makefile.am
View file

@ -383,14 +383,14 @@ small: $(sbin_PROGRAMS) $(bin_PROGRAMS)
extras: $(EXTRA_PROGRAMS)
moc_qphotorec.cpp: qphotorec.h
$(AM_V_GEN) $(MOC) $< -o $@
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $< -o $@
rcc_qphotorec.cpp: qphotorec.qrc
$(AM_V_GEN) $(RCC) $< -o $@ -name qphotorec
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $< -o $@ -name qphotorec
rcc_qphotorec_locale.cpp: qphotorec_locale.qrc $(QT_QM)
$(LN_S) $< $(@D) || exit 0
$(AM_V_GEN) $(RCC) $(@D)/$(<F) -o $@ -name qphotorec_locale
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $(@D)/$(<F) -o $@ -name qphotorec_locale
Android.mk: Makefile.am
androgenizer \
@ -411,4 +411,4 @@ Android.mk: Makefile.am
%.qm: %.ts
$(MKDIR_P) $(@D)
$(AM_V_GEN) $(LRELEASE) -silent $< -qm $@
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@