portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Handle -lssl and pkg-config openssl

Browse source 
- Should fix NetBSD build
This commit is contained in:
pancake 2011-07-14 22:14:11 +02:00
parent 98131d8768
commit c7d59e7ed8
2 changed files with 54 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
configure vendored
View file

@ -1,5 +1,5 @@
#!/bin/sh
# This script was automatically generated by ACR v0.8.6
# This script was automatically generated by ACR v0.8.4
# @author: pancake <youterm.com>
# @url: http://www.nopcode.org
# @repo: hg clone http://hg.youterm.com/acr
@ -145,7 +145,8 @@ System types:
--target=TARGET configure for building compilers for TARGET [HOST]
EOF2
printf "\nOptional Features:
printf "
Optional Features:
--without-debugger disable native debugger features
--without-ewf disable EWF dependency
--without-gmp disable GMP dependency
@ -155,16 +156,20 @@ 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
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
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
}
@ -177,7 +182,7 @@ take_environ() {
}
show_version() {
echo "radare2-0.8b configuration script done with acr v0.8.6.
echo "radare2-0.8b configuration script done with acr v0.8.4.
The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <youterm.com>."
exit 0
@ -269,7 +274,7 @@ parse_options $1
shift
done
ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS LIL_ENDIAN BIG_ENDIAN BYTEORDER HAVE_LIB_EWF HAVE_EWF HAVE_LIB_GMP HAVE_GMP HAVE_LIB_MAGIC HAVE_MAGIC SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL HAVE_LIB_LUA5_1 HAVE_LIB_TCC USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION"
ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS LIL_ENDIAN BIG_ENDIAN BYTEORDER HAVE_LIB_EWF HAVE_EWF HAVE_LIB_GMP HAVE_GMP HAVE_LIB_MAGIC HAVE_MAGIC HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL HAVE_LIB_LUA5_1 HAVE_LIB_TCC USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION"
create_environ
@ -360,6 +365,7 @@ HAVE_LIB_GMP="0"; fi
check_library HAVE_LIB_MAGIC magic 0
if [ "$HAVE_MAGIC" = "0" ]; then
HAVE_LIB_MAGIC="0"; fi
check_library HAVE_LIB_SSL ssl 0
printf 'checking pkg-config flags for openssl... '
tmp=`pkg-config --cflags openssl 2>/dev/null`
if [ $? = 1 ]; then echo no ; HAVE_PKGCFG_OPENSSL=0;
@ -369,8 +375,11 @@ tmp=`pkg-config --libs openssl 2>/dev/null`
if [ ! $? = 1 ]; then
echo yes; HAVE_PKGCFG_OPENSSL=1;
SSL_LDFLAGS=$tmp; fi; fi
if [ "$SSL_LDFLAGS" = "0" ]; then
HAVE_OPENSSL="0"; fi
if [ "$SSL_LDFLAGS" = "" ]; then
if [ "$HAVE_LIB_SSL" = "0" ]; then
HAVE_OPENSSL="0"
else
SSL_LDFLAGS="-lssl"; fi; fi
check_library HAVE_LIB_LUA5_1 lua5.1 0
check_library HAVE_LIB_TCC tcc 0
if [ "$USEROSTYPE" = "auto" ]; then

62
configure.acr
View file

@ -22,9 +22,16 @@ CHKLIB magic
ARG_WITHOUT HAVE_MAGIC magic disable magic dependency ;
IFNOT HAVE_MAGIC { HAVE_LIB_MAGIC = 0 ; }
CHKLIB ssl
PKGCFG SSL_CFLAGS SSL_LDFLAGS openssl
ARG_WITHOUT HAVE_OPENSSL ssl disable openssl dependency ;
IFNOT SSL_LDFLAGS { HAVE_OPENSSL = 0 ; }
IFNULL SSL_LDFLAGS {
IFNOT HAVE_LIB_SSL {
HAVE_OPENSSL = 0 ;
}{
SSL_LDFLAGS = -lssl ;
}
}
CHKLIB lua5.1
CHKLIB tcc
@ -78,30 +85,31 @@ REPORT PREFIX HAVE_LIB_EWF HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIB_TCC
pkgcfg/r_db.pc
))
(( TODO: Add the rest of .pc files here.. add a rule for acr? ))
SUBDIRS ./config-user.mk libr/include/r_userconf.h
pkgcfg/r_io.pc
pkgcfg/r_asm.pc
pkgcfg/r_bin.pc
pkgcfg/r_anal.pc
pkgcfg/r_hash.pc
pkgcfg/r_cons.pc
pkgcfg/r_diff.pc
pkgcfg/r_core.pc
pkgcfg/r_lang.pc
pkgcfg/r_socket.pc
pkgcfg/r_debug.pc
pkgcfg/r_reg.pc
pkgcfg/r_cmd.pc
pkgcfg/r_config.pc
pkgcfg/r_flags.pc
pkgcfg/r_line.pc
pkgcfg/r_syscall.pc
pkgcfg/r_sign.pc
pkgcfg/r_util.pc
pkgcfg/r_search.pc
pkgcfg/r_bp.pc
pkgcfg/r_lib.pc
pkgcfg/r_parse.pc
pkgcfg/r_print.pc
pkgcfg/r_fs.pc
SUBDIRS ./config-user.mk
libr/include/r_userconf.h
pkgcfg/r_io.pc
pkgcfg/r_asm.pc
pkgcfg/r_bin.pc
pkgcfg/r_anal.pc
pkgcfg/r_hash.pc
pkgcfg/r_cons.pc
pkgcfg/r_diff.pc
pkgcfg/r_core.pc
pkgcfg/r_lang.pc
pkgcfg/r_socket.pc
pkgcfg/r_debug.pc
pkgcfg/r_reg.pc
pkgcfg/r_cmd.pc
pkgcfg/r_config.pc
pkgcfg/r_flags.pc
pkgcfg/r_line.pc
pkgcfg/r_syscall.pc
pkgcfg/r_sign.pc
pkgcfg/r_util.pc
pkgcfg/r_search.pc
pkgcfg/r_bp.pc
pkgcfg/r_lib.pc
pkgcfg/r_parse.pc
pkgcfg/r_print.pc
pkgcfg/r_fs.pc
;