summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2013-10-20 12:26:19 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2013-10-20 12:26:19 +0200
commit53e7ab15e97e6be2f1354a13b16bd9855a9271d4 (patch)
tree99470ce5dc397141ea11fb7360192a453e75d35e
parent32ac729a5df7a69ad360ab54f6adacfe6b420510 (diff)
Compile QT interface by default
-rwxr-xr-xcompile.sh19
-rw-r--r--configure.ac12
2 files changed, 20 insertions, 11 deletions
diff --git a/compile.sh b/compile.sh
index 3ff8ad5..c948c6b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -36,12 +36,12 @@ case "$crosscompile_target" in
*-msdosdjgpp)
VER_LIBNTFS3G=
VER_NTFSPROGS="2.0.0"
- VER_E2FSPROGS=1.42.8
+ VER_E2FSPROGS="1.42.8"
;;
*-cygwin)
VER_LIBNTFS3G=
VER_NTFSPROGS="2.0.0"
- VER_E2FSPROGS=1.42.8
+ VER_E2FSPROGS="1.42.8"
export PKG_CONFIG_SYSROOT_DIR=/usr/i386-pc-cygwin/
;;
*-mingw32)
@@ -52,12 +52,12 @@ case "$crosscompile_target" in
i686-apple-darwin9|powerpc-apple-darwin)
VER_LIBNTFS3G="2011.3.28-RC"
VER_NTFSPROGS=
- VER_E2FSPROGS=1.42.8
+ VER_E2FSPROGS="1.42.8"
;;
*)
VER_LIBNTFS3G="2011.3.28-RC"
VER_NTFSPROGS=
- VER_E2FSPROGS=1.42.8
+ VER_E2FSPROGS="1.42.8"
;;
esac
prefix=/usr/$crosscompile_target
@@ -311,13 +311,13 @@ then
# libewf should work under MacOSX but it hasn't been tested
# use --with-ncurses-lib=$prefix/usr/lib to get binaries that don't need libncurses
# but users may be unable to navigate...
- $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ewf --enable-sudo --with-sudo-bin=/usr/bin/sudo
+ $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ewf --enable-sudo --with-sudo-bin=/usr/bin/sudo --disable-qt
;;
i686-apple-darwin9)
- $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --enable-sudo --with-sudo-bin=/usr/bin/sudo
+ $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --enable-sudo --with-sudo-bin=/usr/bin/sudo --disable-qt
;;
i586-pc-msdosdjgpp)
- $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ewf --without-iconv
+ $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ewf --without-iconv --disable-qt
;;
i386-pc-cygwin)
$confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --enable-qt
@@ -329,7 +329,10 @@ then
$confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --enable-missing-uuid-ok --enable-qt
;;
arm-marvell-linux-gnu)
- $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ewf --without-ntfs
+ $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ewf --without-ntfs --disable-qt
+ ;;
+ arm-none-linux-gnueabi|powerpc-linux-gnuspe)
+ $confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT --without-ntfs --disable-qt
;;
*)
$confdir/configure --host=$crosscompile_target --prefix=$prefix $CONFIGUREOPT
diff --git a/configure.ac b/configure.ac
index 84ed5b3..d81ed0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_PREREQ([2.59])
AC_INIT([testdisk],[7.0-WIP],[grenier@cgsecurity.org])
sinclude(acx_pthread.m4)
-TESTDISKDATE="August 2013"
+TESTDISKDATE="October 2013"
AC_SUBST(TESTDISKDATE)
AC_DEFINE_UNQUOTED([TESTDISKDATE],"$TESTDISKDATE",[Date of release])
AC_CONFIG_AUX_DIR(config)
@@ -210,7 +210,7 @@ AC_ARG_ENABLE([qt],
no) use_qt=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-qt]) ;;
esac],
- [use_qt=false])
+ [use_qt=true])
AC_ARG_ENABLE([ncmouse],
AS_HELP_STRING(--enable-ncmouse,enable use of mouse in ncurses(default is NO)),
@@ -541,6 +541,10 @@ if test -z "${use_ncurses}"; then
AC_DEFINE([ENABLE_MOUSE],1,[Define to 1 if the ncurses mouse interface is enabled])
fi
fi
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $photorec_LDADD"
+ AC_CHECK_FUNCS([assume_default_colors])
+ LIBS="$ac_save_LIBS"
else
AC_MSG_WARN(Use of ncurses library disabled)
fi
@@ -802,14 +806,16 @@ AC_CHECK_FUNCS([ntfs_libntfs_version ntfs_volume_startup])
if test "$use_qt" = "true";
then
- PKG_CHECK_MODULES(QTGUI, QtGui >= 4.0.1)
+ PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false)
AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
if test x$MOC = x ; then
AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
+ use_qt=false
fi
AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],)
if test x$RCC = x ; then
AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.)
+ use_qt=false
fi
qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"