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

configure.ac: don't add Qt libs to CXXFLAGS

Browse source
This commit is contained in:
Christophe Grenier 2012-06-18 23:00:12 +02:00
parent ef2eb01d13
commit 3c06eaa1d7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -726,7 +726,7 @@ do
done done
unset option unset option
for option in -Wall -MD -Wpointer-arith -Wmissing-declarations -Wshadow -Wwrite-strings -W -Wcast-align -Waggregate-return -Wcast-qual -Wundef -Wredundant-decls -Wsign-compare -Winline -Wdisabled-optimization -Wmissing-format-attribute -Wmultichar -Wformat=2 for option in -Wall -MD -Wpointer-arith -Wmissing-declarations -Wshadow -Wwrite-strings -W -Wcast-align -Wcast-qual -Wundef -Wredundant-decls -Wsign-compare -Winline -Wdisabled-optimization -Wmissing-format-attribute -Wmultichar -Wformat=2
do do
SAVE_CXXFLAGS="$CXXFLAGS" SAVE_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $option" CXXFLAGS="$CXXFLAGS $option"
@ -775,14 +775,13 @@ AC_CHECK_FUNCS([ntfs_libntfs_version ntfs_volume_startup])
if test "$use_qt" = "true"; if test "$use_qt" = "true";
then then
PKG_CHECK_MODULES(QTCORE, QtCore >= 4.0.1)
PKG_CHECK_MODULES(QTGUI, QtGui >= 4.0.1) PKG_CHECK_MODULES(QTGUI, QtGui >= 4.0.1)
AC_CHECK_TOOLS(MOC,[moc-qt4 moc],) AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
if test x$MOC = x ; then if test x$MOC = x ; then
AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.) AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
fi fi
qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS" qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
CXXFLAGS="$CXXFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS" qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"
fi fi
# e2fsprogs may be using pthread # e2fsprogs may be using pthread
@ -799,10 +798,11 @@ AC_SUBST(CXXFLAGS)
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(MOC) AC_SUBST(MOC)
AC_SUBST(fidentify_LDADD)
AC_SUBST(testdisk_LDADD) AC_SUBST(testdisk_LDADD)
AC_SUBST(photorec_LDADD) AC_SUBST(photorec_LDADD)
AC_SUBST(photorecf_LDADD) AC_SUBST(photorecf_LDADD)
AC_SUBST(qphotorec_LDADD) AC_SUBST(qphotorec_LDADD)
AC_SUBST(fidentify_LDADD) AC_SUBST(qphotorec_CXXFLAGS)
AC_CONFIG_FILES([Makefile src/Makefile linux/testdisk.spec doc_src/testdisk.8 doc_src/photorec.8 doc_src/fidentify.8]) AC_CONFIG_FILES([Makefile src/Makefile linux/testdisk.spec doc_src/testdisk.8 doc_src/photorec.8 doc_src/fidentify.8])
AC_OUTPUT AC_OUTPUT