gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Scrolling is now working with the new scalation/rotation code (there are still few bugs...).

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2391 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Scott Christley 1997-08-22 18:38:38 +00:00
parent 25cfed0e3e
commit 77be56606f
12 changed files with 514 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
Fri Aug 22 11:40:45 1997 Ovidiu Predescu <ovidiu@net-community.com>
Fixed scrolling to work with the new scalation/rotation code.
* Source/PSMatrix.m (-scaleTo:): New method.
* Source/NSCell.m (-trackMouse:...): Check if done before asking if
needs to continue tracking.
* Source/NSClipView.m (-scrollToPoint:): Set the bounds origin to the
oposite point.
* Source/NSScrollView.m (-_doScroll:): Take into consideration the
bounds origin which is in the third quadrant.
* Source/NSView.m (-setBounds:): Use scaleTo: rather than scaleBy:.
(-setBoundsSize:): Likewise.
(-hitTest:): Fixed to work with views that have the bounds origin other
that (0, 0).
Mon Aug 18 09:38:27 1997 Ovidiu Predescu <ovidiu@net-community.com>
Start the port to NeXT PDO under Solaris.

1
Headers/gnustep/gui/PSMatrix.h
View file

@ -39,6 +39,7 @@
- (void)translateToPoint:(NSPoint)point;
- (void)rotateByAngle:(float)angle;
- (void)scaleBy:(float)sx :(float)sy;
- (void)scaleTo:(float)sx :(float)sy;
- (void)makeIdentityMatrix;
- (float)rotationAngle;
- (void)setFrameOrigin:(NSPoint)point;

1
Source/NSApplication.m
View file

@ -466,7 +466,6 @@ static id NSApp;
dequeue:(BOOL)flag
{
NSEvent *event = nil;
int i, j;
event = [self _eventMatchingMask:mask];

3
Source/NSCell.m
View file

@ -709,7 +709,8 @@
}
// should we continue tracking?
if (![self continueTracking:last_point at:point inView:controlView]) {
if (!done
&& ![self continueTracking:last_point at:point inView:controlView]) {
NSDebugLog(@"NSCell stop tracking\n");
done = YES;
}

14
Source/NSClipView.m
View file

@ -92,25 +92,19 @@
- (void)scrollToPoint:(NSPoint)point
{
#if DEBUGLOG
NSPoint currentPoint = [self bounds].origin;
NSDebugLog (@"scrollToPoint: current point (%f, %f), point (%f, %f)",
NSLog (@"scrollToPoint: current point (%f, %f), point (%f, %f)",
currentPoint.x, currentPoint.y,
point.x, point.y);
#endif
point = [self constrainScrollPoint:point];
[super setBoundsOrigin:point];
[super setBoundsOrigin:NSMakePoint(-point.x, -point.y)];
if (_copiesOnScroll)
/* TODO: move the visible portion of the document */;
else {
NSPoint frameOrigin = [_documentView frame].origin;
NSPoint newFrameOrigin;
newFrameOrigin.x = frameOrigin.x - (point.x - currentPoint.x);
newFrameOrigin.y = frameOrigin.y - (point.y - currentPoint.y);
[_documentView setPostsFrameChangedNotifications:NO];
[_documentView setFrameOrigin:newFrameOrigin];
[_documentView setPostsFrameChangedNotifications:YES];
[self display];
[[self window] flushWindow];
}

18
Source/NSScrollView.m
View file

@ -23,6 +23,8 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <math.h>
#include <AppKit/NSScroller.h>
#include <AppKit/NSClipView.h>
#include <AppKit/NSScrollView.h>
@ -212,11 +214,11 @@ static Class rulerViewClass = nil;
if (wasAScrollerButton) {
if (scroller == _horizScroller) {
point.x = clipViewBounds.origin.x + amount;
point.y = clipViewBounds.origin.y;
point.x = -clipViewBounds.origin.x + amount;
point.y = -clipViewBounds.origin.y;
}
else if (scroller == _vertScroller) {
point.x = clipViewBounds.origin.x;
point.x = -clipViewBounds.origin.x;
/* For the vertical scroller the amount should actually be reversed */
amount = -amount;
@ -227,7 +229,7 @@ static Class rulerViewClass = nil;
NSDebugLog (@"increment/decrement: amount = %f, flipped = %d",
amount, [_contentView isFlipped]);
point.y = clipViewBounds.origin.y + amount;
point.y = -clipViewBounds.origin.y + amount;
}
else {
/* do nothing */
@ -238,10 +240,10 @@ static Class rulerViewClass = nil;
if (scroller == _horizScroller) {
point.x = floatValue * (documentRect.size.width
- clipViewBounds.size.width);
point.y = clipViewBounds.origin.y;
point.y = -clipViewBounds.origin.y;
}
else if (scroller == _vertScroller) {
point.x = clipViewBounds.origin.x;
point.x = -clipViewBounds.origin.x;
if (![_contentView isFlipped])
floatValue = 1 - floatValue;
point.y = floatValue * (documentRect.size.height
@ -262,7 +264,7 @@ static Class rulerViewClass = nil;
if (newClipViewBounds.origin.x != clipViewBounds.origin.x) {
/* Update the horizontal scroller */
floatValue = newClipViewBounds.origin.x
floatValue = -newClipViewBounds.origin.x
/ (documentRect.size.width - newClipViewBounds.size.width);
[_horizScroller setFloatValue:floatValue];
[_horizScroller display];
@ -271,7 +273,7 @@ static Class rulerViewClass = nil;
if (newClipViewBounds.origin.x != clipViewBounds.origin.y) {
/* Update the vertical scroller */
floatValue = newClipViewBounds.origin.y
floatValue = -newClipViewBounds.origin.y
/ (documentRect.size.height - newClipViewBounds.size.height);
/* Take care if the document view is not flipped by reversing the meaning
of the float value. */

8
Source/NSScroller.m
View file

@ -453,7 +453,7 @@ static NSButtonCell* knobCell = nil;
if (theCell) {
NSDebugLog (@"tracking cell %x", theCell);
/* Track the mouse while mouse goes up */
/* Track the mouse until mouse goes up */
shouldReturn = [theCell trackMouse:theEvent
inRect:rect
ofView:self
@ -471,7 +471,7 @@ static NSButtonCell* knobCell = nil;
theEvent = [[NSApplication sharedApplication]
nextEventMatchingMask:eventMask
untilDate:[NSDate distantFuture]
inMode:NSEventTrackingRunLoopMode // NSDefaultRunLoopMode
inMode:NSEventTrackingRunLoopMode
dequeue:YES];
eventType = [theEvent type];
location = [self convertPoint:[theEvent locationInWindow] fromView:nil];
@ -496,7 +496,7 @@ static NSButtonCell* knobCell = nil;
- (void)drawRect:(NSRect)rect
{
NSLog (@"NSScroller drawRect: ((%f, %f), (%f, %f))",
NSDebugLog (@"NSScroller drawRect: ((%f, %f), (%f, %f))",
rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
/* Draw the scroller buttons */
@ -517,7 +517,7 @@ static NSButtonCell* knobCell = nil;
NSRect rect = [self rectForPart:(whichButton == NSScrollerIncrementArrow
? NSScrollerIncrementLine
: NSScrollerDecrementLine)];
id theCell;
id theCell = nil;
NSDebugLog (@"position of %s cell is (%f, %f)",
(whichButton == NSScrollerIncrementArrow ? "increment" : "decrement"),

10
Source/NSView.m
View file

@ -461,7 +461,7 @@ static NSRecursiveLock *gnustep_gui_nsview_lock = nil;
{
bounds = aRect;
[boundsMatrix setFrameOrigin:bounds.origin];
[boundsMatrix scaleBy:frame.size.width / bounds.size.width
[boundsMatrix scaleTo:frame.size.width / bounds.size.width
:frame.size.height / bounds.size.height];
if (post_bounds_changes)
@ -482,7 +482,7 @@ static NSRecursiveLock *gnustep_gui_nsview_lock = nil;
- (void)setBoundsSize:(NSSize)newSize
{
bounds.size = newSize;
[boundsMatrix scaleBy:frame.size.width / bounds.size.width
[boundsMatrix scaleTo:frame.size.width / bounds.size.width
:frame.size.height / bounds.size.height];
if (post_bounds_changes)
@ -991,9 +991,11 @@ static NSRecursiveLock *gnustep_gui_nsview_lock = nil;
int i, count;
NSView *v = nil, *w;
// If not within our bounds then immediately return
// If not within our frame then immediately return
if (![self mouse:aPoint inRect:frame])
return nil;
p = [self convertPoint:aPoint fromView:super_view];
if (![self mouse:p inRect:bounds]) return nil;
// Check our sub_views
count = [sub_views count];

11
Source/PSMatrix.m
View file

@ -71,6 +71,17 @@ static const float pi = 3.1415926535897932384626433;
C *= sy; D *= sy;
}
- (void)scaleTo:(float)sx :(float)sy
{
float angle = rotationAngle;
A = sx; B = 0;
C = 0; D = sy;
if (rotationAngle) {
[self rotateByAngle:angle];
rotationAngle = angle;
}
}
- (void)translateToPoint:(NSPoint)point
{
float newTX, newTY;

17
aclocal.m4 vendored
View file

@ -166,26 +166,25 @@ AC_REQUIRE([AC_C_CROSS])dnl
AC_MSG_CHECKING(for the Foundation library)
OBJC_LIBS=
AC_CACHE_VAL(ac_cv_foundation_library,
[if test "$FOUNDATION" = ""; then
AC_LANG_SAVE[]dnl
[AC_LANG_SAVE[]dnl
AC_LANG_OBJECTIVE_C[]
AC_TRY_CPP(
#include <foundation/NSObject.h>
, ac_cv_foundation_library=foundation)
AC_TRY_COMPILE(
#include <Foundation/preface.h>
,
, ac_cv_foundation_library="gnustep-base")
, ac_cv_foundation_library="$ac_cv_foundation_library gnustep-base")
AC_TRY_COMPILE(
#include <Foundation/exceptions/FoundationException.h>
,
, ac_cv_foundation_library="$ac_cv_foundation_library libFoundation")
AC_TRY_COMPILE(
#import <Foundation/NSObject.h>
#import <synch.h>
#include <objects/stdobjects.h>
,
, ac_cv_foundation_library=Sun)
, ac_cv_foundation_library="$ac_cv_foundation_library libobjects")
AC_LANG_RESTORE[]dnl
if test "$FOUNDATION" = ""; then
AC_TRY_CPP(
#include <foundation/NSObject.h>
, ac_cv_foundation_library=foundation)
else
ac_cv_foundation_library=$FOUNDATION
fi

533
configure vendored
View file

@ -11,6 +11,8 @@
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
--with-x use the X Window System"
ac_help="$ac_help
--disable-static Do not build the static library"
ac_help="$ac_help
@ -529,6 +531,7 @@ fi
# Copyright (C) 1996 Free Software Foundation, Inc.
#
# Written by: Scott Christley <scottc@net-community.com>
# Ovidiu Predescu <ovidiu@net-community.com>
#
# This file is part of the GNUstep GUI Library.
#
@ -602,7 +605,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:606: checking host system type" >&5
echo "configure:609: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@ -623,7 +626,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
echo "configure:627: checking target system type" >&5
echo "configure:630: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@ -641,7 +644,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:645: checking build system type" >&5
echo "configure:648: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@ -664,13 +667,27 @@ test "$host_alias" != "$target_alias" &&
program_prefix=${target_alias}-
case "${host_cpu}" in
i[45]86) host_cpu=i386;;
hppa1.1) host_cpu=hppa;;
esac
case "${host_os}" in
solaris2*) host_os=solaris2;;
esac
HOST=$host
HOST_CPU=$host_cpu
HOST_VENDOR=$host_vendor
HOST_OS=$host_os
#--------------------------------------------------------------------
# Find the compiler
#--------------------------------------------------------------------
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:674: checking for $ac_word" >&5
echo "configure:691: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -699,7 +716,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:703: checking for $ac_word" >&5
echo "configure:720: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -747,7 +764,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
echo "configure:768: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@ -757,11 +774,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
#line 761 "configure"
#line 778 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
if { (eval echo configure:765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@ -781,12 +798,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "configure:802: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:790: checking whether we are using GNU C" >&5
echo "configure:807: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -795,7 +812,7 @@ else
yes;
#endif
EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@ -810,7 +827,7 @@ if test $ac_cv_prog_gcc = yes; then
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:814: checking whether ${CC-cc} accepts -g" >&5
echo "configure:831: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -838,7 +855,7 @@ else
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:842: checking how to run the C preprocessor" >&5
echo "configure:859: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@ -853,13 +870,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
#line 857 "configure"
#line 874 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@ -870,13 +887,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
#line 874 "configure"
#line 891 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@ -913,7 +930,7 @@ echo "$ac_t""$CPP" 1>&6
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:917: checking for a BSD compatible install" >&5
echo "configure:934: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -965,7 +982,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:969: checking for $ac_word" >&5
echo "configure:986: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -992,7 +1009,7 @@ else
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
echo "configure:996: checking whether ln -s works" >&5
echo "configure:1013: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1023,12 +1040,12 @@ PIPE='-pipe'
# Standard ANSI headers
#--------------------------------------------------------------------
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:1027: checking for ANSI C header files" >&5
echo "configure:1044: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1032 "configure"
#line 1049 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@ -1036,7 +1053,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@ -1053,7 +1070,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 1057 "configure"
#line 1074 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@ -1071,7 +1088,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 1075 "configure"
#line 1092 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@ -1092,7 +1109,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
#line 1096 "configure"
#line 1113 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@ -1103,7 +1120,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
if { (eval echo configure:1107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:1124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
:
else
@ -1127,6 +1144,249 @@ EOF
fi
#--------------------------------------------------------------------
# Look for the X directory because the DPS related files can be there
# in case we are on a DPS native machine
#--------------------------------------------------------------------
# If we find X, set shell vars x_includes and x_libraries to the
# paths, otherwise set no_x=yes.
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
echo "configure:1157: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
withval="$with_x"
:
fi
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
if test "x$with_x" = xno; then
# The user explicitly disabled X.
have_x=disabled
else
if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
# Both variables are already set.
have_x=yes
else
if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# One or both of the vars are not set, and there is no cached value.
ac_x_includes=NO ac_x_libraries=NO
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
# Make sure to not put "make" in the Imakefile rules, since we grep it out.
cat > Imakefile <<'EOF'
acfindx:
@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
EOF
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
for ac_extension in a so sl; do
if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
test -f $ac_im_libdir/libX11.$ac_extension; then
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
# Screen out bogus values from the imake configuration. They are
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case "$ac_im_incroot" in
/usr/include) ;;
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
esac
case "$ac_im_usrlibdir" in
/usr/lib | /lib) ;;
*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
esac
fi
cd ..
rm -fr conftestdir
fi
if test "$ac_x_includes" = NO; then
# Guess where to find include files, by looking for this one X11 .h file.
test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
#line 1219 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
# We can compile using X headers with no special include directory.
ac_x_includes=
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
# Look for the header file in a standard set of common directories.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in \
/usr/X11/include \
/usr/X11R6/include \
/usr/X11R5/include \
/usr/X11R4/include \
\
/usr/include/X11 \
/usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
\
/usr/local/X11/include \
/usr/local/X11R6/include \
/usr/local/X11R5/include \
/usr/local/X11R4/include \
\
/usr/local/include/X11 \
/usr/local/include/X11R6 \
/usr/local/include/X11R5 \
/usr/local/include/X11R4 \
\
/usr/X386/include \
/usr/x386/include \
/usr/XFree86/include/X11 \
\
/usr/include \
/usr/local/include \
/usr/unsupported/include \
/usr/athena/include \
/usr/local/x11r5/include \
/usr/lpp/Xamples/include \
\
/usr/openwin/include \
/usr/openwin/share/include \
; \
do
if test -r "$ac_dir/$x_direct_test_include"; then
ac_x_includes=$ac_dir
break
fi
done
fi
rm -f conftest*
fi # $ac_x_includes = NO
if test "$ac_x_libraries" = NO; then
# Check for the libraries.
test -z "$x_direct_test_library" && x_direct_test_library=Xt
test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1293 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
if { (eval echo configure:1300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
ac_x_libraries=
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
/usr/X11/lib \
/usr/X11R6/lib \
/usr/X11R5/lib \
/usr/X11R4/lib \
\
/usr/lib/X11 \
/usr/lib/X11R6 \
/usr/lib/X11R5 \
/usr/lib/X11R4 \
\
/usr/local/X11/lib \
/usr/local/X11R6/lib \
/usr/local/X11R5/lib \
/usr/local/X11R4/lib \
\
/usr/local/lib/X11 \
/usr/local/lib/X11R6 \
/usr/local/lib/X11R5 \
/usr/local/lib/X11R4 \
\
/usr/X386/lib \
/usr/x386/lib \
/usr/XFree86/lib/X11 \
\
/usr/lib \
/usr/local/lib \
/usr/unsupported/lib \
/usr/athena/lib \
/usr/local/x11r5/lib \
/usr/lpp/Xamples/lib \
/lib/usr/lib/X11 \
\
/usr/openwin/lib \
/usr/openwin/share/lib \
; \
do
for ac_extension in a so sl; do
if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
done
done
fi
rm -f conftest*
fi # $ac_x_libraries = NO
if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
# Didn't find X anywhere. Cache the known absence of X.
ac_cv_have_x="have_x=no"
else
# Record where we found X for the cache.
ac_cv_have_x="have_x=yes \
ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
fi
fi
fi
eval "$ac_cv_have_x"
fi # $with_x != no
if test "$have_x" != yes; then
echo "$ac_t""$have_x" 1>&6
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
fi
if test $HOST_OS = solaris2; then
ac_x_includes=$ac_x_includes/X11
fi
CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
#--------------------------------------------------------------------
# Look for the TIFF library
#--------------------------------------------------------------------
@ -1134,17 +1394,17 @@ for ac_hdr in tiff.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1138: checking for $ac_hdr" >&5
echo "configure:1398: 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 1143 "configure"
#line 1403 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@ -1189,17 +1449,17 @@ for ac_hdr in DPS/dpsclient.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1193: checking for $ac_hdr" >&5
echo "configure:1453: 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 1198 "configure"
#line 1458 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@ -1250,7 +1510,7 @@ config_include=''
# Checking for some additional libraries we might need
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:1254: checking for dlopen in -ldl" >&5
echo "configure:1514: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1258,7 +1518,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1262 "configure"
#line 1522 "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
@ -1269,7 +1529,7 @@ int main() {
dlopen()
; return 0; }
EOF
if { (eval echo configure:1273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1297,7 +1557,7 @@ else
fi
echo $ac_n "checking for pthread_create in -lpcthread""... $ac_c" 1>&6
echo "configure:1301: checking for pthread_create in -lpcthread" >&5
echo "configure:1561: checking for pthread_create in -lpcthread" >&5
ac_lib_var=`echo pcthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1305,7 +1565,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpcthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1309 "configure"
#line 1569 "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
@ -1316,7 +1576,7 @@ int main() {
pthread_create()
; return 0; }
EOF
if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1342,7 +1602,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
echo "configure:1346: checking for pthread_create in -lpthread" >&5
echo "configure:1606: checking for pthread_create in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1350,7 +1610,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1354 "configure"
#line 1614 "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
@ -1361,7 +1621,7 @@ int main() {
pthread_create()
; return 0; }
EOF
if { (eval echo configure:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1391,7 +1651,7 @@ fi
fi
echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
echo "configure:1395: checking for sqrt in -lm" >&5
echo "configure:1655: checking for sqrt in -lm" >&5
ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -1399,7 +1659,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1403 "configure"
#line 1663 "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
@ -1410,7 +1670,7 @@ int main() {
sqrt()
; return 0; }
EOF
if { (eval echo configure:1414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -1437,79 +1697,117 @@ else
echo "$ac_t""no" 1>&6
fi
# Determine the Foundation library
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
echo "configure:1445: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "checking for chown in -lnsl""... $ac_c" 1>&6
echo "configure:1702: checking for chown in -lnsl" >&5
ac_lib_var=`echo nsl'_'chown | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
#line 1458 "configure"
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1710 "configure"
#include "confdefs.h"
#include <stdlib.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char chown();
int main() {
chown()
; return 0; }
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
if { (eval echo configure:1721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
CXXCPP=/lib/cpp
eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
ac_cv_prog_CXXCPP="$CXXCPP"
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
LIBS="-lnsl $LIBS"
else
echo "$ac_t""no" 1>&6
fi
CXXCPP="$ac_cv_prog_CXXCPP"
echo "$ac_t""$CXXCPP" 1>&6
echo $ac_n "checking for accept in -lsocket""... $ac_c" 1>&6
echo "configure:1749: checking for accept in -lsocket" >&5
ac_lib_var=`echo socket'_'accept | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1757 "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
builtin and then its argument prototype would still apply. */
char accept();
int main() {
accept()
; return 0; }
EOF
if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
LIBS="-lsocket $LIBS"
else
echo "$ac_t""no" 1>&6
fi
# Determine the Foundation library
echo $ac_n "checking for the Foundation library""... $ac_c" 1>&6
echo "configure:1482: checking for the Foundation library" >&5
echo "configure:1799: checking for the Foundation library" >&5
OBJC_LIBS=
if eval "test \"`echo '$''{'ac_cv_foundation_library'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$FOUNDATION" = ""; then
ac_ext=m
ac_ext=m
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $OBJC_RUNTIME_FLAG'
ac_compile='${CC-cc} -c $OBJC_RUNTIME_FLAG $CFLAGS conftest.$ac_ext 1>&5 2>&5'
ac_link='${CC-cc} -o conftest $OBJC_RUNTIME_FLAG $CFLAGS $LDFLAGS conftest.$ac_ext $LIBS $OBJC_LIBS 1>&5 2>&5'
cat > conftest.$ac_ext <<EOF
#line 1495 "configure"
#include "confdefs.h"
#include <foundation/NSObject.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_cv_foundation_library=foundation
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
#line 1513 "configure"
#line 1811 "configure"
#include "confdefs.h"
#include <Foundation/preface.h>
@ -1517,16 +1815,16 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:1521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_foundation_library="gnustep-base"
ac_cv_foundation_library="$ac_cv_foundation_library gnustep-base"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
#line 1530 "configure"
#line 1828 "configure"
#include "confdefs.h"
#include <Foundation/exceptions/FoundationException.h>
@ -1534,7 +1832,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:1538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_foundation_library="$ac_cv_foundation_library libFoundation"
else
@ -1543,18 +1841,17 @@ else
fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
#line 1547 "configure"
#line 1845 "configure"
#include "confdefs.h"
#import <Foundation/NSObject.h>
#import <synch.h>
#include <objects/stdobjects.h>
int main() {
; return 0; }
EOF
if { (eval echo configure:1556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_foundation_library=Sun
ac_cv_foundation_library="$ac_cv_foundation_library libobjects"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
@ -1566,6 +1863,25 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cc_cross
if test "$FOUNDATION" = ""; then
cat > conftest.$ac_ext <<EOF
#line 1869 "configure"
#include "confdefs.h"
#include <foundation/NSObject.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_cv_foundation_library=foundation
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
rm -f conftest*
else
ac_cv_foundation_library=$FOUNDATION
fi
@ -1619,7 +1935,7 @@ EOF
esac
echo "$ac_t""${ac_cv_foundation_library}" 1>&6
echo $ac_n "checking for the Objective-C runtime""... $ac_c" 1>&6
echo "configure:1623: checking for the Objective-C runtime" >&5
echo "configure:1939: checking for the Objective-C runtime" >&5
if eval "test \"`echo '$''{'ac_cv_objc_runtime'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -1631,7 +1947,7 @@ ac_compile='${CC-cc} -c $OBJC_RUNTIME_FLAG $CFLAGS conftest.$ac_ext 1>&5 2>&5'
ac_link='${CC-cc} -o conftest $OBJC_RUNTIME_FLAG $CFLAGS $LDFLAGS conftest.$ac_ext $LIBS $OBJC_LIBS 1>&5 2>&5'
cat > conftest.$ac_ext <<EOF
#line 1635 "configure"
#line 1951 "configure"
#include "confdefs.h"
#include <Foundation/NSString.h>
int main() {
@ -1642,7 +1958,7 @@ extern id objc_lookUpClass(char*);
; return 0; }
EOF
if { (eval echo configure:1646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_cv_objc_runtime=NeXT
else
@ -1657,7 +1973,7 @@ rm -f conftest*
saved_LIBS=$LIBS
LIBS="$OBJC_LIBS -lobjc $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1661 "configure"
#line 1977 "configure"
#include "confdefs.h"
#include <Foundation/NSString.h>
#include <objc/objc-api.h>
@ -1668,7 +1984,7 @@ id class = objc_lookup_class("NSObject");
; return 0; }
EOF
if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:1988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_cv_objc_runtime=GNU
else
@ -1964,7 +2280,6 @@ s%@LN_S@%$LN_S%g
s%@PIPE@%$PIPE%g
s%@config_include@%$config_include%g
s%@FOUNDATION_LIBRARY@%$FOUNDATION_LIBRARY%g
s%@CXXCPP@%$CXXCPP%g
s%@OBJC_RUNTIME@%$OBJC_RUNTIME%g
s%@OBJC_RUNTIME_FLAG@%$OBJC_RUNTIME_FLAG%g
s%@DLLTOOL@%$DLLTOOL%g

29
configure.in
View file

@ -6,6 +6,7 @@ AC_INIT(Source/NSApplication.m)
# Copyright (C) 1996 Free Software Foundation, Inc.
#
# Written by: Scott Christley <scottc@net-community.com>
# Ovidiu Predescu <ovidiu@net-community.com>
#
# This file is part of the GNUstep GUI Library.
#
@ -34,6 +35,22 @@ AC_CONFIG_HEADER(Headers/gnustep/gui/config.h)
#--------------------------------------------------------------------
AC_CANONICAL_SYSTEM
changequote(,)dnl
case "${host_cpu}" in
i[45]86) host_cpu=i386;;
hppa1.1) host_cpu=hppa;;
esac
case "${host_os}" in
solaris2*) host_os=solaris2;;
esac
changequote([,])dnl
HOST=$host
HOST_CPU=$host_cpu
HOST_VENDOR=$host_vendor
HOST_OS=$host_os
#--------------------------------------------------------------------
# Find the compiler
#--------------------------------------------------------------------
@ -58,6 +75,16 @@ AC_SUBST(PIPE)
#--------------------------------------------------------------------
AC_HEADER_STDC
#--------------------------------------------------------------------
# Look for the X directory because the DPS related files can be there
# in case we are on a DPS native machine
#--------------------------------------------------------------------
AC_PATH_X
if test $HOST_OS = solaris2; then
ac_x_includes=$ac_x_includes/X11
fi
CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
#--------------------------------------------------------------------
# Look for the TIFF library
#--------------------------------------------------------------------
@ -107,6 +134,8 @@ AC_CHECK_LIB(pcthread, pthread_create,
,
AC_CHECK_LIB(pthread, pthread_create))
AC_CHECK_LIB(m, sqrt)
AC_CHECK_LIB(nsl, chown)
AC_CHECK_LIB(socket, accept)
# Determine the Foundation library
AC_FIND_FOUNDATION