Remove GMP library check in configure.acr
This commit is contained in:
parent
baae1f6e6a
commit
fd244a97ba
|
@ -21,7 +21,6 @@ CPARSE=0
|
|||
DEBUGGER=1
|
||||
USE_MAGIC=0
|
||||
HAVE_EWF=1
|
||||
HAVE_GMP=1
|
||||
WANT_OPENSSL=0
|
||||
USE_RPATH=0
|
||||
HAVE_LILEND=0
|
||||
|
@ -150,12 +149,12 @@ System types:
|
|||
--target=TARGET configure for building compilers for TARGET [HOST]
|
||||
EOF2
|
||||
|
||||
printf "\nOptional Features:
|
||||
printf "
|
||||
Optional Features:
|
||||
--enable-cparse build with cparse support
|
||||
--disable-debugger disable native debugger features
|
||||
--with-sysmagic force to use system's magic
|
||||
--without-ewf disable EWF dependency
|
||||
--without-gmp disable GMP dependency
|
||||
--with-openssl build with openssl if possible
|
||||
--with-rpath use rpath to build
|
||||
--with-little-endian force little endian
|
||||
|
@ -164,8 +163,10 @@ printf "\nOptional Features:
|
|||
--with-ostype Choose OS type ( gnulinux windows darwin ) (USEROSTYPE=auto)
|
||||
--without-pic do not build libr as a program independent location
|
||||
--with-nonpic build the library archives .a
|
||||
--with-libversion specify different libversion (LIBVERSION=xxx)\n"
|
||||
printf "\nSome influential environment variables:
|
||||
--with-libversion specify different libversion (LIBVERSION=xxx)
|
||||
"
|
||||
printf "
|
||||
Some influential environment variables:
|
||||
CC C compiler command
|
||||
CFLAGS C compiler flags
|
||||
CPPFLAGS C preprocessor flags
|
||||
|
@ -173,8 +174,10 @@ printf "\nSome influential environment variables:
|
|||
nonstandard directory <lib dir>
|
||||
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
|
||||
headers in a nonstandard directory <include dir>
|
||||
CPP C preprocessor\n"
|
||||
printf "\nReport bugs to: pancake <pancake@nopcode.org>"
|
||||
CPP C preprocessor
|
||||
"
|
||||
printf "
|
||||
Report bugs to: pancake <pancake@nopcode.org>"
|
||||
echo ""
|
||||
exit 0
|
||||
}
|
||||
|
@ -216,7 +219,7 @@ echo "LANGS: c"
|
|||
echo "REQUIRED: libdl"
|
||||
echo "OPTIONAL: libmagic"
|
||||
echo "PKG-CONFIG: libewf openssl"
|
||||
echo "FLAGS: --enable-cparse --disable-debugger --with-sysmagic --without-ewf --without-gmp --with-openssl --with-rpath --with-little-endian --with-big-endian --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=xxx"
|
||||
echo "FLAGS: --enable-cparse --disable-debugger --with-sysmagic --without-ewf --with-openssl --with-rpath --with-little-endian --with-big-endian --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=xxx"
|
||||
exit 0
|
||||
;;
|
||||
"--cache-file")
|
||||
|
@ -262,7 +265,6 @@ echo "FLAGS: --enable-cparse --disable-debugger --with-sysmagic --without-ew
|
|||
"--disable-debugger") DEBUGGER="0"; ;;
|
||||
"--with-sysmagic") USE_MAGIC="1"; ;;
|
||||
"--without-ewf") HAVE_EWF="0"; ;;
|
||||
"--without-gmp") HAVE_GMP="0"; ;;
|
||||
"--with-openssl") WANT_OPENSSL="1"; ;;
|
||||
"--with-rpath") USE_RPATH="1"; ;;
|
||||
"--with-little-endian") HAVE_LILEND="1"; ;;
|
||||
|
@ -407,9 +409,8 @@ else
|
|||
HAVE_LIB_EWF="0"; fi
|
||||
if [ "$HAVE_EWF" = "0" ]; then
|
||||
HAVE_LIB_EWF="0"; fi
|
||||
check_library HAVE_LIB_GMP gmp 0
|
||||
if [ "$HAVE_GMP" = "0" ]; then
|
||||
HAVE_LIB_GMP="0"; fi
|
||||
HAVE_LIB_GMP="0"
|
||||
HAVE_GMP="0"
|
||||
check_library HAVE_LIB_SSL ssl 0
|
||||
printf 'checking pkg-config flags for openssl... '
|
||||
tmp=`pkg-config --cflags openssl 2>/dev/null`
|
||||
|
|
|
@ -33,10 +33,13 @@ IF HAVE_PKGCFG_LIBEWF {
|
|||
}
|
||||
IFNOT HAVE_EWF { HAVE_LIB_EWF = 0 ; }
|
||||
|
||||
(( TODO must deprecate ))
|
||||
(( TODO must deprecate
|
||||
CHKLIB gmp
|
||||
ARG_WITHOUT HAVE_GMP gmp disable GMP dependency ;
|
||||
IFNOT HAVE_GMP { HAVE_LIB_GMP = 0 ; }
|
||||
))
|
||||
HAVE_LIB_GMP = 0 ;
|
||||
HAVE_GMP = 0 ;
|
||||
|
||||
CHKLIB ssl
|
||||
PKGCFG SSL_CFLAGS SSL_LDFLAGS openssl
|
||||
|
|
Loading…
Reference in New Issue