Use generic -with-ffi-{include,library} for finding ffi libraries.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@19735 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-07-15 03:09:21 +00:00
parent b7d1039ea8
commit 2feb195024
3 changed files with 33 additions and 32 deletions

View file

@ -1,3 +1,8 @@
2004-07-14 Adam Fedor <fedor@gnu.org>
* configure.ac: Use generic -with-ffi-{include,library} for finding
ffi libraries.
2004-07-13 Andrew Ruder <aeruder@ksu.edu>
* Source/NSMessagePort.m, Source/NSSocketPort.m: Use memmove instead

36
configure vendored
View file

@ -858,8 +858,8 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-ffcall-include=PATH include path for ffcall headers
--with-ffcall-library=PATH library path for ffcall libraries
--with-ffi-include=PATH include path for ffi (ffcall/libffi) headers
--with-ffi-library=PATH library path for ffi (ffcall/libffi) libraries
--with-xml-prefix=PFX Prefix where libxml is installed (optional)
--with-gmp-include=PATH include path for gmp headers
--with-gmp-library=PATH library path for gmp libraries
@ -12338,30 +12338,28 @@ if test $LIBRARY_COMBO = apple-apple-apple; then
fi
# Check whether --with-ffcall-include or --without-ffcall-include was given.
if test "${with_ffcall_include+set}" = set; then
withval="$with_ffcall_include"
ffcall_incdir="$withval"
# Check whether --with-ffi-include or --without-ffi-include was given.
if test "${with_ffi_include+set}" = set; then
withval="$with_ffi_include"
ffi_incdir="$withval"
else
ffcall_incdir="no"
ffi_incdir="no"
fi;
if test ${ffcall_incdir} != "no"; then
ffcall_check_lib_save_cppflags="$CPPFLAGS"
CPPFLAGS="-I${ffcall_incdir} $CPPFLAGS"
INCLUDE_FLAGS="-I${ffcall_incdir} $INCLUDE_FLAGS"
if test ${ffi_incdir} != "no"; then
CPPFLAGS="-I${ffi_incdir} $CPPFLAGS"
INCLUDE_FLAGS="-I${ffi_incdir} $INCLUDE_FLAGS"
fi
# Check whether --with-ffcall-library or --without-ffcall-library was given.
if test "${with_ffcall_library+set}" = set; then
withval="$with_ffcall_library"
ffcall_libdir="$withval"
# Check whether --with-ffi-library or --without-ffi-library was given.
if test "${with_ffi_library+set}" = set; then
withval="$with_ffi_library"
ffi_libdir="$withval"
else
ffcall_libdir="no"
ffi_libdir="no"
fi;
if test ${ffcall_libdir} != "no"; then
ffcall_check_lib_save_libs="$LIBS"
LIBS="-L${ffcall_libdir} $LIBS"
if test ${ffi_libdir} != "no"; then
LIBS="-L${ffi_libdir} $LIBS"
fi
if test "${ac_cv_header_ffi_h+set}" = set; then

View file

@ -926,21 +926,19 @@ if test $LIBRARY_COMBO = apple-apple-apple; then
enable_do=no
fi
AC_ARG_WITH(ffcall-include,
[ --with-ffcall-include=PATH include path for ffcall headers],
ffcall_incdir="$withval", ffcall_incdir="no")
if test ${ffcall_incdir} != "no"; then
ffcall_check_lib_save_cppflags="$CPPFLAGS"
CPPFLAGS="-I${ffcall_incdir} $CPPFLAGS"
INCLUDE_FLAGS="-I${ffcall_incdir} $INCLUDE_FLAGS"
AC_ARG_WITH(ffi-include,
[ --with-ffi-include=PATH include path for ffi (ffcall/libffi) headers],
ffi_incdir="$withval", ffi_incdir="no")
if test ${ffi_incdir} != "no"; then
CPPFLAGS="-I${ffi_incdir} $CPPFLAGS"
INCLUDE_FLAGS="-I${ffi_incdir} $INCLUDE_FLAGS"
fi
AC_ARG_WITH(ffcall-library,
[ --with-ffcall-library=PATH library path for ffcall libraries],
ffcall_libdir="$withval", ffcall_libdir="no")
if test ${ffcall_libdir} != "no"; then
ffcall_check_lib_save_libs="$LIBS"
LIBS="-L${ffcall_libdir} $LIBS"
AC_ARG_WITH(ffi-library,
[ --with-ffi-library=PATH library path for ffi (ffcall/libffi) libraries],
ffi_libdir="$withval", ffi_libdir="no")
if test ${ffi_libdir} != "no"; then
LIBS="-L${ffi_libdir} $LIBS"
fi
AC_CHECK_HEADER(ffi.h, have_libffi=yes, have_libffi=no)