mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 09:04:13 +00:00
Enable ffcall by default
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8531 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
e0256e7ac3
commit
f47f73cb11
3 changed files with 47 additions and 30 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2001-01-08 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Enable ffcall by default (unless the libraries
|
||||
don't exist).
|
||||
|
||||
2001-01-08 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Headers/Foundation/NSGArray.h: removed
|
||||
|
|
|
|||
64
configure
vendored
64
configure
vendored
|
|
@ -4372,6 +4372,7 @@ echo "$ac_t""$enable_fake_main" 1>&6
|
|||
|
||||
#--------------------------------------------------------------------
|
||||
# Check for FFI interface libraries for invocations
|
||||
# We enable ffcall by default now.
|
||||
#--------------------------------------------------------------------
|
||||
# Check whether --enable-libffi or --disable-libffi was given.
|
||||
if test "${enable_libffi+set}" = set; then
|
||||
|
|
@ -4386,23 +4387,23 @@ if test "${enable_ffcall+set}" = set; then
|
|||
enableval="$enable_ffcall"
|
||||
:
|
||||
else
|
||||
enable_ffcall=no
|
||||
enable_ffcall=yes
|
||||
fi
|
||||
|
||||
|
||||
ac_safe=`echo "ffi.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for ffi.h""... $ac_c" 1>&6
|
||||
echo "configure:4396: checking for ffi.h" >&5
|
||||
echo "configure:4397: checking for ffi.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4401 "configure"
|
||||
#line 4402 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <ffi.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -4426,9 +4427,9 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking "for forwarding callback in runtime"""... $ac_c" 1>&6
|
||||
echo "configure:4430: checking "for forwarding callback in runtime"" >&5
|
||||
echo "configure:4431: checking "for forwarding callback in runtime"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4432 "configure"
|
||||
#line 4433 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <objc/objc-api.h>
|
||||
EOF
|
||||
|
|
@ -4446,17 +4447,17 @@ for ac_hdr in callback.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:4450: checking for $ac_hdr" >&5
|
||||
echo "configure:4451: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4455 "configure"
|
||||
#line 4456 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -4485,7 +4486,7 @@ done
|
|||
|
||||
|
||||
echo $ac_n "checking "FFI library usage"""... $ac_c" 1>&6
|
||||
echo "configure:4489: checking "FFI library usage"" >&5
|
||||
echo "configure:4490: checking "FFI library usage"" >&5
|
||||
WITH_FFI=none
|
||||
if test $enable_libffi = yes; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
|
|
@ -4503,6 +4504,11 @@ EOF
|
|||
echo "$ac_t""ffcall" 1>&6
|
||||
else
|
||||
echo "$ac_t""none" 1>&6
|
||||
echo "configure: warning: No ffcall interface library found" 1>&2
|
||||
echo
|
||||
echo "GNUstep requires the ffcall library to do invocations and DO"
|
||||
echo "Make sure this library is installed (see installation instructions"
|
||||
echo "Otherwise DO will not be compatible with other systems"
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -4537,7 +4543,7 @@ fi
|
|||
# Extract the first word of "xml-config", so it can be a program name with args.
|
||||
set dummy xml-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4541: checking for $ac_word" >&5
|
||||
echo "configure:4547: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_XML_CONFIG'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4572,7 +4578,7 @@ fi
|
|||
|
||||
min_xml_version=2.2.3
|
||||
echo $ac_n "checking for libxml - version >= $min_xml_version""... $ac_c" 1>&6
|
||||
echo "configure:4576: checking for libxml - version >= $min_xml_version" >&5
|
||||
echo "configure:4582: checking for libxml - version >= $min_xml_version" >&5
|
||||
no_xml=""
|
||||
if test "$XML_CONFIG" = "no" ; then
|
||||
no_xml=yes
|
||||
|
|
@ -4595,7 +4601,7 @@ echo "configure:4576: checking for libxml - version >= $min_xml_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4599 "configure"
|
||||
#line 4605 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
|
@ -4670,7 +4676,7 @@ main()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:4674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:4680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -4765,17 +4771,17 @@ for ac_hdr in openssl/ssl.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:4769: checking for $ac_hdr" >&5
|
||||
echo "configure:4775: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4774 "configure"
|
||||
#line 4780 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -4807,7 +4813,7 @@ if test $ac_cv_header_openssl_ssl_h = no; then
|
|||
echo "configure: warning: Could not find openssl headers" 1>&2
|
||||
else
|
||||
echo $ac_n "checking for CRYPTO_malloc in -lcrypto""... $ac_c" 1>&6
|
||||
echo "configure:4811: checking for CRYPTO_malloc in -lcrypto" >&5
|
||||
echo "configure:4817: checking for CRYPTO_malloc in -lcrypto" >&5
|
||||
ac_lib_var=`echo crypto'_'CRYPTO_malloc | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -4815,7 +4821,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcrypto $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4819 "configure"
|
||||
#line 4825 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -4826,7 +4832,7 @@ int main() {
|
|||
CRYPTO_malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -4851,7 +4857,7 @@ fi
|
|||
base_libs="$LIBS"
|
||||
LIBS="$LIBS -lcrypto"
|
||||
echo $ac_n "checking for ssl2_clear in -lssl""... $ac_c" 1>&6
|
||||
echo "configure:4855: checking for ssl2_clear in -lssl" >&5
|
||||
echo "configure:4861: checking for ssl2_clear in -lssl" >&5
|
||||
ac_lib_var=`echo ssl'_'ssl2_clear | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -4859,7 +4865,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lssl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4863 "configure"
|
||||
#line 4869 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -4870,7 +4876,7 @@ int main() {
|
|||
ssl2_clear()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -4945,17 +4951,17 @@ for ac_hdr in gmp.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:4949: checking for $ac_hdr" >&5
|
||||
echo "configure:4955: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4954 "configure"
|
||||
#line 4960 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -4987,7 +4993,7 @@ if test $ac_cv_header_gmp_h = no; then
|
|||
echo "configure: warning: Could not find gmp headers" 1>&2
|
||||
else
|
||||
echo $ac_n "checking for mpf_abs in -lgmp""... $ac_c" 1>&6
|
||||
echo "configure:4991: checking for mpf_abs in -lgmp" >&5
|
||||
echo "configure:4997: checking for mpf_abs in -lgmp" >&5
|
||||
ac_lib_var=`echo gmp'_'mpf_abs | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -4995,7 +5001,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lgmp $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4999 "configure"
|
||||
#line 5005 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -5006,7 +5012,7 @@ int main() {
|
|||
mpf_abs()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
|
|||
|
|
@ -787,13 +787,14 @@ AC_MSG_RESULT($enable_fake_main)
|
|||
|
||||
#--------------------------------------------------------------------
|
||||
# Check for FFI interface libraries for invocations
|
||||
# We enable ffcall by default now.
|
||||
#--------------------------------------------------------------------
|
||||
AC_ARG_ENABLE(libffi,
|
||||
[ --enable-libffi Enable use of libffi library],,
|
||||
enable_libffi=no)
|
||||
AC_ARG_ENABLE(ffcall,
|
||||
[ --enable-ffcall Enable use of ffcall library],,
|
||||
enable_ffcall=no)
|
||||
enable_ffcall=yes)
|
||||
|
||||
AC_CHECK_HEADER(ffi.h, , enable_libffi=no)
|
||||
|
||||
|
|
@ -814,6 +815,11 @@ elif test $enable_ffcall = yes; then
|
|||
AC_MSG_RESULT(ffcall)
|
||||
else
|
||||
AC_MSG_RESULT(none)
|
||||
AC_WARN(No ffcall interface library found)
|
||||
echo
|
||||
echo "GNUstep requires the ffcall library to do invocations and DO"
|
||||
echo "Make sure this library is installed (see installation instructions"
|
||||
echo "Otherwise DO will not be compatible with other systems"
|
||||
fi
|
||||
AC_SUBST(WITH_FFI)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue