mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Check for LLONG_MAX. Check for -lcipher
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@11249 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
36e6268f6c
commit
8016f866e8
7 changed files with 691 additions and 653 deletions
|
@ -1,3 +1,11 @@
|
|||
2001-10-25 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Check for LLONG_MAX. Check for -lcipher.
|
||||
(Patch from chrisv@web4inc.com with modifications).
|
||||
* Source/GSFormat.m: If we have LLONG_MAX, define LONG_LONG_MAX
|
||||
to match.
|
||||
* Source/NSScanner.m: Likewise.
|
||||
|
||||
2001-10-24 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* configure.in: Check for zlib
|
||||
|
|
|
@ -56,7 +56,10 @@
|
|||
|
||||
#undef HAVE_PTS_STREAM_MODULES
|
||||
#undef HAVE_UINTMAX_T
|
||||
|
||||
/* Define one of the following if you have the appropriate constant */
|
||||
#undef HANDLE_LONG_LONG_MAX
|
||||
#undef HANDLE_LLONG_MAX
|
||||
|
||||
/* Define if nested functions are broken on this compiler */
|
||||
#undef BROKEN_NESTED_FUNCTIONS
|
||||
|
|
|
@ -80,9 +80,16 @@ typedef gsu32 wint_t;
|
|||
typedef unsigned long long uintmax_t;
|
||||
#endif
|
||||
|
||||
/* Darwin 1.0 CPP can't handle this */
|
||||
#ifndef HANDLE_LONG_LONG_MAX
|
||||
#undef LONG_LONG_MAX
|
||||
/* BSD and Solaris have this */
|
||||
#ifdef HANDLE_LLONG_MAX
|
||||
#define LONG_LONG_MAX LLONG_MAX
|
||||
#define LONG_LONG_MIN LLONG_MIN
|
||||
#define ULONG_LONG_MAX ULLONG_MAX
|
||||
#else
|
||||
/* Darwin 1.0 CPP can't handle this */
|
||||
# ifndef HANDLE_LONG_LONG_MAX
|
||||
# undef LONG_LONG_MAX
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <base/behavior.h>
|
||||
|
|
|
@ -32,6 +32,13 @@
|
|||
#include <math.h>
|
||||
#include <ctype.h> /* FIXME: May go away once I figure out Unicode */
|
||||
|
||||
/* BSD and Solaris have this */
|
||||
#ifdef HANDLE_LLONG_MAX
|
||||
#define LONG_LONG_MAX LLONG_MAX
|
||||
#define LONG_LONG_MIN LLONG_MIN
|
||||
#define ULONG_LONG_MAX ULLONG_MAX
|
||||
#endif
|
||||
|
||||
@implementation NSScanner
|
||||
|
||||
@class GSCString;
|
||||
|
|
|
@ -41,7 +41,10 @@
|
|||
|
||||
#undef HAVE_PTS_STREAM_MODULES
|
||||
#undef HAVE_UINTMAX_T
|
||||
|
||||
/* Define one of the following if you have the appropriate constant */
|
||||
#undef HANDLE_LONG_LONG_MAX
|
||||
#undef HANDLE_LLONG_MAX
|
||||
|
||||
/* Define if nested functions are broken on this compiler */
|
||||
#undef BROKEN_NESTED_FUNCTIONS
|
||||
|
|
26
configure.in
26
configure.in
|
@ -622,6 +622,26 @@ if test $llmax = yes; then
|
|||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
#
|
||||
# Solaris and *BSD use LLONG_MAX instead
|
||||
#
|
||||
AC_MSG_CHECKING([whether to use LLONG_MAX instead])
|
||||
|
||||
AC_TRY_CPP([#include <limits.h>
|
||||
#include <machine/limits.h>
|
||||
#if defined(LLONG_MAX)
|
||||
#if LONG_MAX != LLONG_MAX
|
||||
#endif
|
||||
#endif
|
||||
], llmax=yes, llmax=no)
|
||||
|
||||
if test $llmax = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HANDLE_LLONG_MAX)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
AC_CHECK_HEADERS(wchar.h)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
@ -858,6 +878,12 @@ if test $enable_openssl = yes; then
|
|||
LIBS="$base_libs -lssl -lcrypto"
|
||||
AC_DEFINE(HAVE_OPENSSL)
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(cipher,des_setkey,cipher_ok=yes,cipher_ok=no)
|
||||
if test "$cipher_ok" = yes; then
|
||||
LIBS="$LIBS -lcipher"
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue