mirror of
https://github.com/gnustep/libs-back.git
synced 2025-04-22 15:31:14 +00:00
Fix non-X configure, Remove old graphics methods
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@13418 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor
parent
a0a3300b3a
commit
85c5f90400
7 changed files with 246 additions and 195 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2002-04-10 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Don't set X paths if no X found. Only set
|
||||
/usr/local paths for freebsd
|
||||
|
||||
* Source/gsc/GSContext.m: Remove currentgstate, gstate
|
||||
* Source/x11/XGServerWindow.m (windowbacking:) Implement.
|
||||
|
||||
2002-04-06 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Renable XIM by default again.
|
||||
|
|
|
|||
|
|
@ -370,19 +370,6 @@ static unsigned int unique_index = 0;
|
|||
/* Gstate Handling */
|
||||
/* ----------------------------------------------------------------------- */
|
||||
|
||||
/* Depreciated. Use GSReplaceGState */
|
||||
- (void) DPScurrentgstate: (int)gst
|
||||
{
|
||||
if (gst)
|
||||
{
|
||||
/* Associate/copy current gstate with gst */
|
||||
ctxt_push([NSNumber numberWithInt: gst], opstack);
|
||||
ctxt_push(gstate, opstack);
|
||||
[self DPSdefineuserobject];
|
||||
[self DPSexecuserobject: gst];
|
||||
}
|
||||
}
|
||||
|
||||
- (void) DPSgrestore
|
||||
{
|
||||
if (GSIArrayCount((GSIArray)gstack) == 0)
|
||||
|
|
@ -400,12 +387,6 @@ static unsigned int unique_index = 0;
|
|||
gstate = [gstate copy];
|
||||
}
|
||||
|
||||
/* Depreciated. Use GSDefineGstate */
|
||||
- (void) DPSgstate
|
||||
{
|
||||
ctxt_push(AUTORELEASE([gstate copy]), opstack);
|
||||
}
|
||||
|
||||
- (void) DPSinitgraphics
|
||||
{
|
||||
[gstate DPSinitgraphics];
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ extern int XGErrorHandler(Display *display, XErrorEvent *err);
|
|||
if (dpy == NULL)
|
||||
{
|
||||
char *dname = XDisplayName([display_name cString]);
|
||||
[NSException raise: @"DPSconfigurationerror"
|
||||
[NSException raise: NSWindowServerCommunicationException
|
||||
format: @"Unable to connect to X Server `%s'", dname];
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1194,9 +1194,23 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
|
|||
}
|
||||
}
|
||||
|
||||
- (void) windowbacking: (NSBackingStoreType)type
|
||||
- (void) windowbacking: (NSBackingStoreType)type : (int) win
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
gswindow_device_t *window;
|
||||
|
||||
window = WINDOW_WITH_TAG(win);
|
||||
if (!window)
|
||||
return;
|
||||
|
||||
NSDebugLLog(@"XGTrace", @"DPSwindowbacking: %@ : %d", type, win);
|
||||
|
||||
if (window->buffer && type == NSBackingStoreNonretained)
|
||||
{
|
||||
XFreePixmap (XDPY, window->buffer);
|
||||
window->buffer = 0;
|
||||
}
|
||||
window->type = type;
|
||||
[self _createBuffer: window];
|
||||
}
|
||||
|
||||
- (void) titlewindow: (NSString *)window_title : (int) win
|
||||
|
|
|
|||
|
|
@ -336,11 +336,6 @@
|
|||
DPScurrentgray(dps_context, gray);
|
||||
}
|
||||
|
||||
- (void)DPScurrentgstate: (int)gst
|
||||
{
|
||||
DPScurrentgstate(dps_context, gst);
|
||||
}
|
||||
|
||||
- (void)DPScurrenthalftone
|
||||
{
|
||||
DPScurrenthalftone(dps_context);
|
||||
|
|
@ -426,11 +421,6 @@
|
|||
DPSgsave(dps_context);
|
||||
}
|
||||
|
||||
- (void)DPSgstate
|
||||
{
|
||||
DPSgstate(dps_context);
|
||||
}
|
||||
|
||||
- (void)DPSinitgraphics
|
||||
{
|
||||
DPSinitgraphics(dps_context);
|
||||
|
|
|
|||
286
configure
vendored
286
configure
vendored
|
|
@ -931,14 +931,16 @@ else
|
|||
wprefix=${with_wraster}/
|
||||
fi
|
||||
|
||||
GRAPHIC_LIBS=`${wprefix}get-wraster-flags --libs`
|
||||
GRAPHIC_CFLAGS=`${wprefix}get-wraster-flags --cflags`
|
||||
GRAPHIC_LFLAGS=`${wprefix}get-wraster-flags --ldflags`
|
||||
if test "x$with_wraster" != "xnone"; then
|
||||
GRAPHIC_LIBS=`${wprefix}get-wraster-flags --libs`
|
||||
GRAPHIC_CFLAGS=`${wprefix}get-wraster-flags --cflags | sed -e "s|-I/usr/include||"`
|
||||
GRAPHIC_LFLAGS=`${wprefix}get-wraster-flags --ldflags`
|
||||
fi
|
||||
|
||||
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:942: checking how to run the C preprocessor" >&5
|
||||
echo "configure:944: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -953,13 +955,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 957 "configure"
|
||||
#line 959 "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:963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:965: \"$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
|
||||
:
|
||||
|
|
@ -970,13 +972,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 974 "configure"
|
||||
#line 976 "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:980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:982: \"$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
|
||||
:
|
||||
|
|
@ -987,13 +989,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 991 "configure"
|
||||
#line 993 "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:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:999: \"$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
|
||||
:
|
||||
|
|
@ -1018,7 +1020,7 @@ fi
|
|||
echo "$ac_t""$CPP" 1>&6
|
||||
|
||||
echo $ac_n "checking for current libwraster support""... $ac_c" 1>&6
|
||||
echo "configure:1022: checking for current libwraster support" >&5
|
||||
echo "configure:1024: checking for current libwraster support" >&5
|
||||
if eval "test \"`echo '$''{'gs_cv_have_wraster'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1027,9 +1029,9 @@ wraster_check_save_libs=${LIBS}
|
|||
CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}"
|
||||
LIBS="${GRAPHIC_LIBS} $LIBS"
|
||||
|
||||
# Check for RFillImage which is only in version 2.0 or libwraster
|
||||
# Check for RFillImage which is only in version 2.0 of libwraster
|
||||
echo $ac_n "checking for RFillImage in -lwraster""... $ac_c" 1>&6
|
||||
echo "configure:1033: checking for RFillImage in -lwraster" >&5
|
||||
echo "configure:1035: checking for RFillImage in -lwraster" >&5
|
||||
ac_lib_var=`echo wraster'_'RFillImage | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1037,7 +1039,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lwraster $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1041 "configure"
|
||||
#line 1043 "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
|
||||
|
|
@ -1048,7 +1050,7 @@ int main() {
|
|||
RFillImage()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1054: \"$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
|
||||
|
|
@ -1074,17 +1076,17 @@ if test "$gs_cv_have_wraster" = yes; then
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:1078: checking for $ac_hdr" >&5
|
||||
echo "configure:1080: 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 1083 "configure"
|
||||
#line 1085 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1090: \"$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*
|
||||
|
|
@ -1139,7 +1141,7 @@ fi
|
|||
# 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:1143: checking for X" >&5
|
||||
echo "configure:1145: checking for X" >&5
|
||||
|
||||
# Check whether --with-x or --without-x was given.
|
||||
if test "${with_x+set}" = set; then
|
||||
|
|
@ -1201,12 +1203,12 @@ if test "$ac_x_includes" = NO; then
|
|||
|
||||
# First, try using that file with no special directory specified.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1205 "configure"
|
||||
#line 1207 "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:1210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1212: \"$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*
|
||||
|
|
@ -1275,14 +1277,14 @@ if test "$ac_x_libraries" = NO; then
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$x_direct_test_library $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1279 "configure"
|
||||
#line 1281 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
${x_direct_test_function}()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
# We can link X programs with no special library path.
|
||||
|
|
@ -1388,17 +1390,17 @@ else
|
|||
case "`(uname -sr) 2>/dev/null`" in
|
||||
"SunOS 5"*)
|
||||
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
|
||||
echo "configure:1392: checking whether -R must be followed by a space" >&5
|
||||
echo "configure:1394: checking whether -R must be followed by a space" >&5
|
||||
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1395 "configure"
|
||||
#line 1397 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_R_nospace=yes
|
||||
else
|
||||
|
|
@ -1414,14 +1416,14 @@ rm -f conftest*
|
|||
else
|
||||
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1418 "configure"
|
||||
#line 1420 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_R_space=yes
|
||||
else
|
||||
|
|
@ -1453,7 +1455,7 @@ rm -f conftest*
|
|||
# libraries were built with DECnet support. And karl@cs.umb.edu says
|
||||
# the Alpha needs dnet_stub (dnet does not exist).
|
||||
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
|
||||
echo "configure:1457: checking for dnet_ntoa in -ldnet" >&5
|
||||
echo "configure:1459: checking for dnet_ntoa in -ldnet" >&5
|
||||
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1461,7 +1463,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1465 "configure"
|
||||
#line 1467 "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
|
||||
|
|
@ -1472,7 +1474,7 @@ int main() {
|
|||
dnet_ntoa()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1478: \"$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
|
||||
|
|
@ -1494,7 +1496,7 @@ fi
|
|||
|
||||
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
|
||||
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
|
||||
echo "configure:1498: checking for dnet_ntoa in -ldnet_stub" >&5
|
||||
echo "configure:1500: checking for dnet_ntoa in -ldnet_stub" >&5
|
||||
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1502,7 +1504,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet_stub $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1506 "configure"
|
||||
#line 1508 "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
|
||||
|
|
@ -1513,7 +1515,7 @@ int main() {
|
|||
dnet_ntoa()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1519: \"$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
|
||||
|
|
@ -1542,12 +1544,12 @@ fi
|
|||
# The nsl library prevents programs from opening the X display
|
||||
# on Irix 5.2, according to dickey@clark.net.
|
||||
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
|
||||
echo "configure:1546: checking for gethostbyname" >&5
|
||||
echo "configure:1548: checking for gethostbyname" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1551 "configure"
|
||||
#line 1553 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char gethostbyname(); below. */
|
||||
|
|
@ -1570,7 +1572,7 @@ gethostbyname();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_gethostbyname=yes"
|
||||
else
|
||||
|
|
@ -1591,7 +1593,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_gethostbyname = no; then
|
||||
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
|
||||
echo "configure:1595: checking for gethostbyname in -lnsl" >&5
|
||||
echo "configure:1597: checking for gethostbyname in -lnsl" >&5
|
||||
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1599,7 +1601,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lnsl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1603 "configure"
|
||||
#line 1605 "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
|
||||
|
|
@ -1610,7 +1612,7 @@ int main() {
|
|||
gethostbyname()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1616: \"$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
|
||||
|
|
@ -1640,12 +1642,12 @@ fi
|
|||
# -lsocket must be given before -lnsl if both are needed.
|
||||
# We assume that if connect needs -lnsl, so does gethostbyname.
|
||||
echo $ac_n "checking for connect""... $ac_c" 1>&6
|
||||
echo "configure:1644: checking for connect" >&5
|
||||
echo "configure:1646: checking for connect" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1649 "configure"
|
||||
#line 1651 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char connect(); below. */
|
||||
|
|
@ -1668,7 +1670,7 @@ connect();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_connect=yes"
|
||||
else
|
||||
|
|
@ -1689,7 +1691,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_connect = no; then
|
||||
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:1693: checking for connect in -lsocket" >&5
|
||||
echo "configure:1695: checking for connect in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1697,7 +1699,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1701 "configure"
|
||||
#line 1703 "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
|
||||
|
|
@ -1708,7 +1710,7 @@ int main() {
|
|||
connect()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1714: \"$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
|
||||
|
|
@ -1732,12 +1734,12 @@ fi
|
|||
|
||||
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
|
||||
echo $ac_n "checking for remove""... $ac_c" 1>&6
|
||||
echo "configure:1736: checking for remove" >&5
|
||||
echo "configure:1738: checking for remove" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1741 "configure"
|
||||
#line 1743 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char remove(); below. */
|
||||
|
|
@ -1760,7 +1762,7 @@ remove();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_remove=yes"
|
||||
else
|
||||
|
|
@ -1781,7 +1783,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_remove = no; then
|
||||
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
|
||||
echo "configure:1785: checking for remove in -lposix" >&5
|
||||
echo "configure:1787: checking for remove in -lposix" >&5
|
||||
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1789,7 +1791,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lposix $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1793 "configure"
|
||||
#line 1795 "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
|
||||
|
|
@ -1800,7 +1802,7 @@ int main() {
|
|||
remove()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1806: \"$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
|
||||
|
|
@ -1824,12 +1826,12 @@ fi
|
|||
|
||||
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
||||
echo $ac_n "checking for shmat""... $ac_c" 1>&6
|
||||
echo "configure:1828: checking for shmat" >&5
|
||||
echo "configure:1830: checking for shmat" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1833 "configure"
|
||||
#line 1835 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char shmat(); below. */
|
||||
|
|
@ -1852,7 +1854,7 @@ shmat();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_shmat=yes"
|
||||
else
|
||||
|
|
@ -1873,7 +1875,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_shmat = no; then
|
||||
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
|
||||
echo "configure:1877: checking for shmat in -lipc" >&5
|
||||
echo "configure:1879: checking for shmat in -lipc" >&5
|
||||
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1881,7 +1883,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lipc $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1885 "configure"
|
||||
#line 1887 "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
|
||||
|
|
@ -1892,7 +1894,7 @@ int main() {
|
|||
shmat()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1898: \"$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
|
||||
|
|
@ -1925,7 +1927,7 @@ fi
|
|||
# libraries we check for below, so use a different variable.
|
||||
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
|
||||
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
|
||||
echo "configure:1929: checking for IceConnectionNumber in -lICE" >&5
|
||||
echo "configure:1931: checking for IceConnectionNumber in -lICE" >&5
|
||||
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1933,7 +1935,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1937 "configure"
|
||||
#line 1939 "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
|
||||
|
|
@ -1944,7 +1946,7 @@ int main() {
|
|||
IceConnectionNumber()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1950: \"$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
|
||||
|
|
@ -1968,6 +1970,9 @@ fi
|
|||
|
||||
fi
|
||||
|
||||
if test "x$no_x" = xyes; then
|
||||
set_x_paths=no
|
||||
fi
|
||||
|
||||
if test $set_x_paths = yes; then
|
||||
GRAPHIC_CFLAGS="$X_CFLAGS"
|
||||
|
|
@ -1979,7 +1984,7 @@ if test $set_x_paths = yes; then
|
|||
CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}"
|
||||
LIBS="${GRAPHIC_LIBS} ${LIBS}"
|
||||
echo $ac_n "checking for main in -lXext""... $ac_c" 1>&6
|
||||
echo "configure:1983: checking for main in -lXext" >&5
|
||||
echo "configure:1988: checking for main in -lXext" >&5
|
||||
ac_lib_var=`echo Xext'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1987,14 +1992,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXext $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1991 "configure"
|
||||
#line 1996 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2003: \"$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
|
||||
|
|
@ -2022,7 +2027,7 @@ fi
|
|||
fi
|
||||
LIBS="${GRAPHIC_LIBS} ${LIBS}"
|
||||
echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6
|
||||
echo "configure:2026: checking for main in -lXmu" >&5
|
||||
echo "configure:2031: checking for main in -lXmu" >&5
|
||||
ac_lib_var=`echo Xmu'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2030,14 +2035,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXmu $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2034 "configure"
|
||||
#line 2039 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2046: \"$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
|
||||
|
|
@ -2104,17 +2109,17 @@ for ac_hdr in DPS/dpsclient.h DPS/dpsNXargs.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2108: checking for $ac_hdr" >&5
|
||||
echo "configure:2113: 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 2113 "configure"
|
||||
#line 2118 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2123: \"$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*
|
||||
|
|
@ -2173,7 +2178,7 @@ save_libs=${LIBS}
|
|||
CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}"
|
||||
LIBS="${GRAPHIC_LIBS} ${LIBS}"
|
||||
echo $ac_n "checking for XftFontOpen in -lXft""... $ac_c" 1>&6
|
||||
echo "configure:2177: checking for XftFontOpen in -lXft" >&5
|
||||
echo "configure:2182: checking for XftFontOpen in -lXft" >&5
|
||||
ac_lib_var=`echo Xft'_'XftFontOpen | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2181,7 +2186,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lXft $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2185 "configure"
|
||||
#line 2190 "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
|
||||
|
|
@ -2192,7 +2197,7 @@ int main() {
|
|||
XftFontOpen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2201: \"$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
|
||||
|
|
@ -2215,17 +2220,17 @@ fi
|
|||
|
||||
ac_safe=`echo "X11/Xft/Xft.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for X11/Xft/Xft.h""... $ac_c" 1>&6
|
||||
echo "configure:2219: checking for X11/Xft/Xft.h" >&5
|
||||
echo "configure:2224: checking for X11/Xft/Xft.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 2224 "configure"
|
||||
#line 2229 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <X11/Xft/Xft.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2234: \"$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*
|
||||
|
|
@ -2284,7 +2289,7 @@ if test "${with_jpeg_library+set}" = set; then
|
|||
withval="$with_jpeg_library"
|
||||
:
|
||||
else
|
||||
with_jpeg_library=/usr/local/lib
|
||||
with_jpeg_library=
|
||||
fi
|
||||
|
||||
# Check whether --with-jpeg_include or --without-jpeg_include was given.
|
||||
|
|
@ -2292,18 +2297,32 @@ if test "${with_jpeg_include+set}" = set; then
|
|||
withval="$with_jpeg_include"
|
||||
:
|
||||
else
|
||||
with_jpeg_include=/usr/local/include
|
||||
with_jpeg_include=
|
||||
fi
|
||||
|
||||
|
||||
if test "$with_jpeg_library" = ""; then
|
||||
case "$target_os" in
|
||||
freebsd*) with_jpeg_include="/usr/local/include"
|
||||
with_jpeg_library="/usr/local/lib";;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test -n "$with_jpeg_library"; then
|
||||
with_jpeg_library="-L$with_jpeg_library"
|
||||
fi
|
||||
if test -n "$with_jpeg_include"; then
|
||||
with_jpeg_include="-I$with_jpeg_include"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then
|
||||
jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-L${with_jpeg_library} -I${with_jpeg_include} ${CPPFLAGS}"
|
||||
CPPFLAGS="${with_jpeg_library} ${with_jpeg_include} ${CPPFLAGS}"
|
||||
|
||||
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:2307: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
echo "configure:2326: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2311,7 +2330,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2315 "configure"
|
||||
#line 2334 "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
|
||||
|
|
@ -2322,7 +2341,7 @@ int main() {
|
|||
jpeg_destroy_decompress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2345: \"$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
|
||||
|
|
@ -2345,9 +2364,9 @@ fi
|
|||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
|
||||
echo "configure:2349: checking for jpeglib.h" >&5
|
||||
echo "configure:2368: checking for jpeglib.h" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2351 "configure"
|
||||
#line 2370 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#undef PACKAGE
|
||||
|
|
@ -2356,7 +2375,7 @@ echo "configure:2349: checking for jpeglib.h" >&5
|
|||
#include <jpeglib.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2379: \"$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*
|
||||
|
|
@ -2372,8 +2391,8 @@ rm -f conftest*
|
|||
echo "$ac_t""$jpeg_ok" 1>&6
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
GRAPHIC_LFLAGS="-L${with_jpeg_library} $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="-I${with_jpeg_library} $GRAPHIC_CFLAGS"
|
||||
GRAPHIC_LFLAGS="${with_jpeg_library} $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="${with_jpeg_include} $GRAPHIC_CFLAGS"
|
||||
fi
|
||||
fi
|
||||
CPPFLAGS="${jpeg_check_lib_save_header}"
|
||||
|
|
@ -2387,7 +2406,7 @@ if test "${with_tiff_library+set}" = set; then
|
|||
withval="$with_tiff_library"
|
||||
:
|
||||
else
|
||||
with_tiff_library=/usr/local/lib
|
||||
with_tiff_library=
|
||||
fi
|
||||
|
||||
# Check whether --with-tiff_include or --without-tiff_include was given.
|
||||
|
|
@ -2395,18 +2414,32 @@ if test "${with_tiff_include+set}" = set; then
|
|||
withval="$with_tiff_include"
|
||||
:
|
||||
else
|
||||
with_tiff_include=/usr/local/include
|
||||
with_tiff_include=
|
||||
fi
|
||||
|
||||
|
||||
if test "$with_tiff_library" = ""; then
|
||||
case "$target_os" in
|
||||
freebsd*) with_tiff_include="/usr/local/include"
|
||||
with_tiff_library="/usr/local/lib";;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test -n "$with_tiff_library"; then
|
||||
with_tiff_library="-L$with_tiff_library"
|
||||
fi
|
||||
if test -n "$with_tiff_include"; then
|
||||
with_tiff_include="-I$with_tiff_include"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then
|
||||
tiff_check_lib_save_header=${CPPFLAGS}
|
||||
tiff_check_lib_save_libs=${LIBS}
|
||||
CPPFLAGS="-L${with_tiff_library} ${JPEG_LIB} -I${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
CPPFLAGS="${with_tiff_library} ${JPEG_LIB} ${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
echo $ac_n "checking for main in -lz""... $ac_c" 1>&6
|
||||
echo "configure:2410: checking for main in -lz" >&5
|
||||
echo "configure:2443: checking for main in -lz" >&5
|
||||
ac_lib_var=`echo z'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2414,14 +2447,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2418 "configure"
|
||||
#line 2451 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2458: \"$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
|
||||
|
|
@ -2444,17 +2477,17 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for -ltiff without -ljpeg nor -lz""... $ac_c" 1>&6
|
||||
echo "configure:2448: checking for -ltiff without -ljpeg nor -lz" >&5
|
||||
echo "configure:2481: checking for -ltiff without -ljpeg nor -lz" >&5
|
||||
LIBS="-ltiff -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2451 "configure"
|
||||
#line 2484 "configure"
|
||||
#include "confdefs.h"
|
||||
char TIFFReadScanline();
|
||||
int main() {
|
||||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
jpeg_notneeded=yes
|
||||
else
|
||||
|
|
@ -2473,17 +2506,17 @@ fi
|
|||
|
||||
if test $HAVE_LIBZ = 1; then
|
||||
echo $ac_n "checking for -ltiff without -lz""... $ac_c" 1>&6
|
||||
echo "configure:2477: checking for -ltiff without -lz" >&5
|
||||
echo "configure:2510: checking for -ltiff without -lz" >&5
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2480 "configure"
|
||||
#line 2513 "configure"
|
||||
#include "confdefs.h"
|
||||
char TIFFReadScanline();
|
||||
int main() {
|
||||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
libz_notneeded=yes
|
||||
else
|
||||
|
|
@ -2501,7 +2534,7 @@ rm -f conftest*
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
|
||||
echo "configure:2505: checking for TIFFReadScanline in -ltiff" >&5
|
||||
echo "configure:2538: checking for TIFFReadScanline in -ltiff" >&5
|
||||
ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2509,7 +2542,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2513 "configure"
|
||||
#line 2546 "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
|
||||
|
|
@ -2520,7 +2553,7 @@ int main() {
|
|||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2557: \"$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
|
||||
|
|
@ -2539,31 +2572,22 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
tiff_ok=no
|
||||
echo "configure: warning: Cannot find libtiff" 1>&2
|
||||
echo "* The GUI library reqiures the TIFF library"
|
||||
echo "* Use --with-tiff-library to specify the tiff library"
|
||||
echo "* directory if it is not in the usual place(s)"
|
||||
echo "* You may also have to specify --with-jpeg-library if the jpeg"
|
||||
echo "* Library is needed by tiff"
|
||||
if test "x$CONFIGURING_CORE_LIBRARIES" != x; then
|
||||
{ echo "configure: error: You must have proper libraries installed to compile core" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$tiff_ok" = yes; then
|
||||
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
|
||||
echo "configure:2557: checking for tiffio.h" >&5
|
||||
echo "configure:2581: checking for tiffio.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 2562 "configure"
|
||||
#line 2586 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tiffio.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2591: \"$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*
|
||||
|
|
@ -2586,37 +2610,44 @@ tiff_ok=no
|
|||
fi
|
||||
|
||||
if test "$tiff_ok" = yes; then
|
||||
GRAPHIC_LFLAGS="-L${with_tiff_library} $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="-I${with_tiff_library} $GRAPHIC_CFLAGS"
|
||||
GRAPHIC_LFLAGS="${with_tiff_library} $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="${with_tiff_include} $GRAPHIC_CFLAGS"
|
||||
GRAPHIC_LIBS="-ltiff $JPEG $GRAPHIC_LIBS"
|
||||
else
|
||||
echo "configure: warning: Cannot find libtiff header tiffio" 1>&2
|
||||
echo "* The GUI library requres the TIFF library"
|
||||
echo "* Use --with-tiff-include to specify the tiff header directory"
|
||||
echo "* and --with-tiff-library to specify the tiff library directory"
|
||||
echo "* if it is not in the usual place(s)"
|
||||
if test "x$CONFIGURING_CORE_LIBRARIES" != x; then
|
||||
{ echo "configure: error: You must have proper libraries installed to compile core" 1>&2; exit 1; }
|
||||
fi
|
||||
{ echo "configure: error: gnustep-gui will not compile without tiff includes" 1>&2; exit 1; }
|
||||
fi
|
||||
else
|
||||
echo "configure: warning: Cannot find libtiff" 1>&2
|
||||
echo "* The GUI library reqiures the TIFF library"
|
||||
echo "* Use --with-tiff-library to specify the tiff library"
|
||||
echo "* directory if it is not in the usual place(s)"
|
||||
echo "* You may also have to specify --with-jpeg-library if the jpeg"
|
||||
echo "* library is needed by tiff",
|
||||
{ echo "configure: error: gnustep-gui will not compile without tiff" 1>&2; exit 1; }
|
||||
fi
|
||||
CPPFLAGS="${tiff_check_lib_save_header}"
|
||||
fi
|
||||
fi
|
||||
|
||||
save_CPPFLAGS=${CPPFLAGS}
|
||||
CPPFLAGS="$CPPFLAGS $GRAPHIC_CFLAGS"
|
||||
ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6
|
||||
echo "configure:2610: checking for X11/extensions/XShm.h" >&5
|
||||
echo "configure:2641: checking for X11/extensions/XShm.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 2615 "configure"
|
||||
#line 2646 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <X11/extensions/XShm.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2651: \"$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*
|
||||
|
|
@ -2710,7 +2741,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking Backend Server""... $ac_c" 1>&6
|
||||
echo "configure:2714: checking Backend Server" >&5
|
||||
echo "configure:2745: checking Backend Server" >&5
|
||||
if test "x$enable_win32" = "xyes"; then
|
||||
BUILD_WIN32=yes
|
||||
|
||||
|
|
@ -2733,7 +2764,7 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking Backend Graphics""... $ac_c" 1>&6
|
||||
echo "configure:2737: checking Backend Graphics" >&5
|
||||
echo "configure:2768: checking Backend Graphics" >&5
|
||||
if test "x$enable_winlib" = "xyes"; then
|
||||
BUILD_WINLIB=yes
|
||||
|
||||
|
|
@ -2775,11 +2806,14 @@ if test "${with_name+set}" = set; then
|
|||
:
|
||||
fi
|
||||
|
||||
echo $ac_n "checking Backend name""... $ac_c" 1>&6
|
||||
echo "configure:2811: checking Backend name" >&5
|
||||
if test "x$with_name" = "x"; then
|
||||
BACKEND_NAME=back
|
||||
else
|
||||
BACKEND_NAME=${with_name}
|
||||
fi
|
||||
echo "$ac_t""$BACKEND_NAME" 1>&6
|
||||
|
||||
|
||||
trap '' 1 2 15
|
||||
|
|
@ -3161,5 +3195,3 @@ chmod +x $CONFIG_STATUS
|
|||
rm -fr confdefs* $ac_clean_files
|
||||
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
98
configure.in
98
configure.in
|
|
@ -71,9 +71,11 @@ else
|
|||
wprefix=${with_wraster}/
|
||||
fi
|
||||
|
||||
GRAPHIC_LIBS=`${wprefix}get-wraster-flags --libs`
|
||||
GRAPHIC_CFLAGS=`${wprefix}get-wraster-flags --cflags`
|
||||
GRAPHIC_LFLAGS=`${wprefix}get-wraster-flags --ldflags`
|
||||
if test "x$with_wraster" != "xnone"; then
|
||||
GRAPHIC_LIBS=`${wprefix}get-wraster-flags --libs`
|
||||
GRAPHIC_CFLAGS=`${wprefix}get-wraster-flags --cflags | sed -e "s|-I/usr/include||"`
|
||||
GRAPHIC_LFLAGS=`${wprefix}get-wraster-flags --ldflags`
|
||||
fi
|
||||
|
||||
AC_DEFUN(AC_CHECK_WRASTER,
|
||||
[dnl
|
||||
|
|
@ -84,7 +86,7 @@ wraster_check_save_libs=${LIBS}
|
|||
CPPFLAGS="$1 $2 ${CPPFLAGS}"
|
||||
LIBS="$3 $LIBS"
|
||||
|
||||
# Check for RFillImage which is only in version 2.0 or libwraster
|
||||
# Check for RFillImage which is only in version 2.0 of libwraster
|
||||
AC_CHECK_LIB(wraster, RFillImage, gs_cv_have_wraster=yes, gs_cv_have_wraster=no)
|
||||
if test "$gs_cv_have_wraster" = yes; then
|
||||
AC_CHECK_HEADERS(wraster.h, gs_cv_have_wraster=yes, gs_cv_have_wraster=no)
|
||||
|
|
@ -112,6 +114,9 @@ if test $gs_cv_have_wraster = no -o $x_includes != NONE; then
|
|||
set_x_paths=yes
|
||||
fi
|
||||
AC_PATH_XTRA
|
||||
if test "x$no_x" = xyes; then
|
||||
set_x_paths=no
|
||||
fi
|
||||
|
||||
if test $set_x_paths = yes; then
|
||||
GRAPHIC_CFLAGS="$X_CFLAGS"
|
||||
|
|
@ -213,14 +218,28 @@ fi
|
|||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(jpeg_library,
|
||||
[ --with-jpeg-library=DIR JPEG library file are in DIR], ,
|
||||
with_jpeg_library=/usr/local/lib)
|
||||
with_jpeg_library=)
|
||||
AC_ARG_WITH(jpeg_include,
|
||||
[ --with-jpeg-include=DIR JPEG include files are in DIR], ,
|
||||
with_jpeg_include=/usr/local/include)
|
||||
with_jpeg_include=)
|
||||
|
||||
if test "$with_jpeg_library" = ""; then
|
||||
case "$target_os" in
|
||||
freebsd*) with_jpeg_include="/usr/local/include"
|
||||
with_jpeg_library="/usr/local/lib";;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test -n "$with_jpeg_library"; then
|
||||
with_jpeg_library="-L$with_jpeg_library"
|
||||
fi
|
||||
if test -n "$with_jpeg_include"; then
|
||||
with_jpeg_include="-I$with_jpeg_include"
|
||||
fi
|
||||
|
||||
AC_DEFUN(AC_CHECK_JPEGLIB,
|
||||
[jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-L$1 -I$2 ${CPPFLAGS}"
|
||||
CPPFLAGS="$1 $2 ${CPPFLAGS}"
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
|
||||
jpeg_ok=yes,
|
||||
|
|
@ -237,8 +256,8 @@ if test "$jpeg_ok" = yes; then
|
|||
AC_MSG_RESULT($jpeg_ok)
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
GRAPHIC_LFLAGS="-L$1 $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="-I$1 $GRAPHIC_CFLAGS"
|
||||
GRAPHIC_LFLAGS="$1 $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$2 $GRAPHIC_CFLAGS"
|
||||
fi
|
||||
fi
|
||||
CPPFLAGS="${jpeg_check_lib_save_header}"])
|
||||
|
|
@ -252,15 +271,29 @@ fi
|
|||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(tiff_library,
|
||||
[ --with-tiff-library=DIR TIFF library file are in DIR], ,
|
||||
with_tiff_library=/usr/local/lib)
|
||||
with_tiff_library=)
|
||||
AC_ARG_WITH(tiff_include,
|
||||
[ --with-tiff-include=DIR TIFF include files are in DIR], ,
|
||||
with_tiff_include=/usr/local/include)
|
||||
with_tiff_include=)
|
||||
|
||||
if test "$with_tiff_library" = ""; then
|
||||
case "$target_os" in
|
||||
freebsd*) with_tiff_include="/usr/local/include"
|
||||
with_tiff_library="/usr/local/lib";;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test -n "$with_tiff_library"; then
|
||||
with_tiff_library="-L$with_tiff_library"
|
||||
fi
|
||||
if test -n "$with_tiff_include"; then
|
||||
with_tiff_include="-I$with_tiff_include"
|
||||
fi
|
||||
|
||||
AC_DEFUN(AC_CHECK_TIFFLIB,
|
||||
[tiff_check_lib_save_header=${CPPFLAGS}
|
||||
tiff_check_lib_save_libs=${LIBS}
|
||||
CPPFLAGS="-L$1 ${JPEG_LIB} -I$2 ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
CPPFLAGS="$1 ${JPEG_LIB} $2 ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
AC_CHECK_LIB(z, main, HAVE_LIBZ=1, HAVE_LIBZ=0)
|
||||
|
||||
AC_MSG_CHECKING(for -ltiff without -ljpeg nor -lz)
|
||||
|
|
@ -288,42 +321,35 @@ if test $HAVE_LIBZ = 1; then
|
|||
fi
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(tiff, TIFFReadScanline,
|
||||
tiff_ok=yes,
|
||||
tiff_ok=no
|
||||
AC_MSG_WARN(Cannot find libtiff)
|
||||
echo "* The GUI library reqiures the TIFF library"
|
||||
echo "* Use --with-tiff-library to specify the tiff library"
|
||||
echo "* directory if it is not in the usual place(s)"
|
||||
echo "* You may also have to specify --with-jpeg-library if the jpeg"
|
||||
echo "* Library is needed by tiff"
|
||||
if test "x$CONFIGURING_CORE_LIBRARIES" != x; then
|
||||
AC_MSG_ERROR(You must have proper libraries installed to compile core)
|
||||
fi,
|
||||
$JPEG -lm)
|
||||
AC_CHECK_LIB(tiff, TIFFReadScanline, tiff_ok=yes, tiff_ok=no, $JPEG -lm)
|
||||
if test "$tiff_ok" = yes; then
|
||||
AC_CHECK_HEADER(tiffio.h,
|
||||
tiff_ok=yes,
|
||||
tiff_ok=no)
|
||||
AC_CHECK_HEADER(tiffio.h, tiff_ok=yes, tiff_ok=no)
|
||||
if test "$tiff_ok" = yes; then
|
||||
GRAPHIC_LFLAGS="-L$1 $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="-I$1 $GRAPHIC_CFLAGS"
|
||||
GRAPHIC_LFLAGS="$1 $GRAPHIC_LFLAGS"
|
||||
GRAPHIC_CFLAGS="$2 $GRAPHIC_CFLAGS"
|
||||
GRAPHIC_LIBS="-ltiff $JPEG $GRAPHIC_LIBS"
|
||||
else
|
||||
AC_MSG_WARN(Cannot find libtiff header tiffio)
|
||||
echo "* The GUI library requres the TIFF library"
|
||||
echo "* Use --with-tiff-include to specify the tiff header directory"
|
||||
echo "* and --with-tiff-library to specify the tiff library directory"
|
||||
echo "* if it is not in the usual place(s)"
|
||||
if test "x$CONFIGURING_CORE_LIBRARIES" != x; then
|
||||
AC_MSG_ERROR(You must have proper libraries installed to compile core)
|
||||
fi
|
||||
AC_MSG_ERROR(gnustep-gui will not compile without tiff includes)
|
||||
fi
|
||||
else
|
||||
AC_MSG_WARN(Cannot find libtiff)
|
||||
echo "* The GUI library reqiures the TIFF library"
|
||||
echo "* Use --with-tiff-library to specify the tiff library"
|
||||
echo "* directory if it is not in the usual place(s)"
|
||||
echo "* You may also have to specify --with-jpeg-library if the jpeg"
|
||||
echo "* library is needed by tiff",
|
||||
AC_MSG_ERROR(gnustep-gui will not compile without tiff)
|
||||
fi
|
||||
CPPFLAGS="${tiff_check_lib_save_header}"])
|
||||
|
||||
if test $gs_cv_have_wraster = no -o $set_x_paths = yes; then
|
||||
AC_CHECK_TIFFLIB(${with_tiff_library}, ${with_tiff_include})
|
||||
fi
|
||||
fi
|
||||
|
||||
save_CPPFLAGS=${CPPFLAGS}
|
||||
CPPFLAGS="$CPPFLAGS $GRAPHIC_CFLAGS"
|
||||
|
|
@ -414,13 +440,13 @@ fi
|
|||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(name,
|
||||
[ --with-name=PREFIX Set the name of the backend (def=back)])
|
||||
AC_MSG_CHECKING(Backend name)
|
||||
if test "x$with_name" = "x"; then
|
||||
BACKEND_NAME=back
|
||||
else
|
||||
BACKEND_NAME=${with_name}
|
||||
fi
|
||||
AC_MSG_RESULT($BACKEND_NAME)
|
||||
AC_SUBST(BACKEND_NAME)
|
||||
|
||||
AC_OUTPUT(back.make config.make)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue