mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 13:10:59 +00:00
Fix up dps configuration (again).
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2958 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
2e1c63979e
commit
f38f3a21ae
7 changed files with 17 additions and 620 deletions
|
|
@ -1,3 +1,9 @@
|
|||
Thu Sep 3 15:18:39 1998 Adam Fedor <fedor@ultra.doc.com>
|
||||
|
||||
* Source/GNUmakefile.postamble: Don't move config.h
|
||||
* Source/GNUmakefile.preamble: Don't include special config.h dir.
|
||||
(ADDITONAL_CPPFLAGS): Add DPS_DEFINE.
|
||||
|
||||
Thur Sept 3 1998 Felipe A. Rodriguez <far@ix.netcom.com>
|
||||
|
||||
* NSMenuItem.m in copyWithZone: fixed bug which crashed menus two or more
|
||||
|
|
|
|||
|
|
@ -29,15 +29,8 @@
|
|||
#ifndef _GNUstep_H_DPSOperators
|
||||
#define _GNUstep_H_DPSOperators
|
||||
|
||||
#include "config.h"
|
||||
|
||||
// Use the DPSclient library if we have it
|
||||
#ifdef HAVE_DPS_DPSCLIENT_H
|
||||
|
||||
#include <DPS/dpsclient.h>
|
||||
#include <DPS/psops.h>
|
||||
|
||||
#else
|
||||
// Use alternate DPS definitions if we don't have a DPS library
|
||||
#if defined(HAVE_DPS_DPSCLIENT) && HAVE_DPS_DPSCLIENT_H == 0
|
||||
|
||||
typedef void (*DPSTextProc)();
|
||||
typedef void (*DPSErrorProc)();
|
||||
|
|
@ -83,6 +76,11 @@ typedef struct {
|
|||
DPSBinObjRec objects[1];
|
||||
} DPSBinObjSeqRec, *DPSBinObjSeq;
|
||||
|
||||
#else
|
||||
|
||||
#include <DPS/dpsclient.h>
|
||||
#include <DPS/psops.h>
|
||||
|
||||
#endif /* HAVE_DPS_DPSCLIENT_H */
|
||||
|
||||
#endif /* _GNUstep_H_DPSOperators */
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@
|
|||
#ifndef _GNUstep_H_config
|
||||
#define _GNUstep_H_config
|
||||
|
||||
/* Define this if the DPS client library exists */
|
||||
#undef HAVE_DPS_DPSCLIENT_H
|
||||
|
||||
#include <Foundation/NSGeometry.h>
|
||||
|
||||
/* Define NSDebugLog if not defined */
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#
|
||||
|
||||
# Things to do before compiling
|
||||
before-all:: $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h
|
||||
#before-all::
|
||||
|
||||
# Things to do after compiling
|
||||
# after-all::
|
||||
|
|
@ -73,12 +73,3 @@ before-all:: $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h
|
|||
|
||||
#
|
||||
# GNUstep GUI Library specific targets
|
||||
|
||||
#
|
||||
#
|
||||
# The config.h file is specific to a target
|
||||
#
|
||||
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h: ../config.status
|
||||
$(GNUSTEP_MAKEFILES)/mkinstalldirs \
|
||||
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
|
||||
-mv ../config.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@
|
|||
|
||||
# Additional flags to pass to the preprocessor
|
||||
GNUSTEP_INSTALL_LIBDIR=$(GNUSTEP_LIBRARIES_ROOT)
|
||||
ADDITIONAL_CPPFLAGS = -DGNUSTEP_INSTALL_LIBDIR=\"$(GNUSTEP_INSTALL_LIBDIR)\"
|
||||
ADDITIONAL_CPPFLAGS = -DGNUSTEP_INSTALL_LIBDIR=\"$(GNUSTEP_INSTALL_LIBDIR)\" \
|
||||
${DPS_DEFINE}
|
||||
|
||||
# Additional flags to pass to the Objective-C compiler
|
||||
ADDITIONAL_OBJCFLAGS = -g -Wall
|
||||
|
|
@ -49,8 +50,7 @@ ADDITIONAL_OBJCFLAGS = -g -Wall
|
|||
ADDITIONAL_CFLAGS = -g
|
||||
|
||||
# Additional include directories the compiler should search
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../Headers\
|
||||
-I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../Headers
|
||||
|
||||
# Additional LDFLAGS to pass to the linker
|
||||
ADDITIONAL_LDFLAGS =
|
||||
|
|
|
|||
550
configure
vendored
550
configure
vendored
|
|
@ -11,8 +11,6 @@
|
|||
ac_help=
|
||||
ac_default_prefix=/usr/local
|
||||
# Any additions from configure.in:
|
||||
ac_help="$ac_help
|
||||
--with-x use the X Window System"
|
||||
|
||||
# Initialize some variables set by options.
|
||||
# The variables have the same names as the options, with
|
||||
|
|
@ -523,552 +521,6 @@ fi
|
|||
|
||||
|
||||
|
||||
# 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:530: 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
|
||||
if test -n "$CC"; then
|
||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||
for ac_dir in $PATH; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_prog_CC="gcc"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
fi
|
||||
fi
|
||||
CC="$ac_cv_prog_CC"
|
||||
if test -n "$CC"; then
|
||||
echo "$ac_t""$CC" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
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:559: 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
|
||||
if test -n "$CC"; then
|
||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||
else
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||
ac_prog_rejected=no
|
||||
for ac_dir in $PATH; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
|
||||
ac_prog_rejected=yes
|
||||
continue
|
||||
fi
|
||||
ac_cv_prog_CC="cc"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
if test $ac_prog_rejected = yes; then
|
||||
# We found a bogon in the path, so make sure we never use it.
|
||||
set dummy $ac_cv_prog_CC
|
||||
shift
|
||||
if test $# -gt 0; then
|
||||
# We chose a different compiler from the bogus one.
|
||||
# However, it has the same basename, so the bogon will be chosen
|
||||
# first if we set CC to just the basename; use the full file name.
|
||||
shift
|
||||
set dummy "$ac_dir/$ac_word" "$@"
|
||||
shift
|
||||
ac_cv_prog_CC="$@"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
CC="$ac_cv_prog_CC"
|
||||
if test -n "$CC"; then
|
||||
echo "$ac_t""$CC" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:607: 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.
|
||||
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
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 617 "configure"
|
||||
#include "confdefs.h"
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:621: \"$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
|
||||
ac_cv_prog_cc_cross=no
|
||||
else
|
||||
ac_cv_prog_cc_cross=yes
|
||||
fi
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
ac_cv_prog_cc_works=no
|
||||
fi
|
||||
rm -fr conftest*
|
||||
|
||||
echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
|
||||
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:641: 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:646: 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
|
||||
cat > conftest.c <<EOF
|
||||
#ifdef __GNUC__
|
||||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:655: \"$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
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
|
||||
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
GCC=yes
|
||||
ac_test_CFLAGS="${CFLAGS+set}"
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:670: 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
|
||||
echo 'void f(){}' > conftest.c
|
||||
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
|
||||
ac_cv_prog_cc_g=yes
|
||||
else
|
||||
ac_cv_prog_cc_g=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
|
||||
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
|
||||
if test "$ac_test_CFLAGS" = set; then
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
elif test $ac_cv_prog_cc_g = yes; then
|
||||
CFLAGS="-g -O2"
|
||||
else
|
||||
CFLAGS="-O2"
|
||||
fi
|
||||
else
|
||||
GCC=
|
||||
test "${CFLAGS+set}" = set || CFLAGS="-g"
|
||||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:698: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
fi
|
||||
if test -z "$CPP"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
# This must be in double quotes, not single quotes, because CPP may get
|
||||
# substituted into the Makefile and "${CC-cc}" will confuse make.
|
||||
CPP="${CC-cc} -E"
|
||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 713 "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:719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 730 "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:736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
CPP=/lib/cpp
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
rm -f conftest*
|
||||
ac_cv_prog_CPP="$CPP"
|
||||
fi
|
||||
CPP="$ac_cv_prog_CPP"
|
||||
else
|
||||
ac_cv_prog_CPP="$CPP"
|
||||
fi
|
||||
echo "$ac_t""$CPP" 1>&6
|
||||
|
||||
# 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:763: 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 825 "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:830: \"$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 899 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
${x_direct_test_function}()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:906: \"$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 "$ac_x_includes" != ""; then
|
||||
CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
|
||||
fi
|
||||
if test -r $ac_x_includes/X11/DPS; then
|
||||
CPPFLAGS="$CPPFLAGS -I$ac_x_includes/X11"
|
||||
fi
|
||||
|
||||
if test -f ../make/clean_cpu.sh; then
|
||||
transformed_host_cpu=`../make/clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`../make/clean_cpu.sh $target_cpu`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
||||
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -f ../make/clean_os.sh; then
|
||||
transformed_host_os=`../make/clean_os.sh $host_os`
|
||||
transformed_target_os=`../make/clean_os.sh $target_os`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
||||
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
||||
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
||||
fi
|
||||
fi
|
||||
|
||||
ac_cv_file_output_directory=Source/$transformed_host_cpu/$transformed_host_os
|
||||
|
||||
# Add the target header file directory as an include path so that the
|
||||
# check for dpsNXargs.h below looks at the appropriate target includes
|
||||
ORIG_C_INCLUDE_PATH=${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_SYSTEM_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_LOCAL_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_USER_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
export C_INCLUDE_PATH
|
||||
|
||||
# We care about this header file on the target not host system
|
||||
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:1033: 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 1038 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=yes"
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
# Restore back to the original
|
||||
C_INCLUDE_PATH=${ORIG_C_INCLUDE_PATH}
|
||||
|
||||
trap '' 1 2 15
|
||||
cat > confcache <<\EOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
|
@ -1199,8 +651,6 @@ s%@includedir@%$includedir%g
|
|||
s%@oldincludedir@%$oldincludedir%g
|
||||
s%@infodir@%$infodir%g
|
||||
s%@mandir@%$mandir%g
|
||||
s%@CC@%$CC%g
|
||||
s%@CPP@%$CPP%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
|
|
|||
45
configure.in
45
configure.in
|
|
@ -27,51 +27,6 @@ AC_INIT(Source/NSApplication.m)
|
|||
|
||||
AC_CONFIG_HEADER(Headers/gnustep/gui/config.h)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
AC_PATH_X
|
||||
|
||||
if test "$ac_x_includes" != ""; then
|
||||
CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
|
||||
fi
|
||||
if test -r $ac_x_includes/X11/DPS; then
|
||||
CPPFLAGS="$CPPFLAGS -I$ac_x_includes/X11"
|
||||
fi
|
||||
|
||||
if test -f ../make/clean_cpu.sh; then
|
||||
transformed_host_cpu=`../make/clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`../make/clean_cpu.sh $target_cpu`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
||||
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -f ../make/clean_os.sh; then
|
||||
transformed_host_os=`../make/clean_os.sh $host_os`
|
||||
transformed_target_os=`../make/clean_os.sh $target_os`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
||||
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
||||
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
||||
fi
|
||||
fi
|
||||
|
||||
ac_cv_file_output_directory=Source/$transformed_host_cpu/$transformed_host_os
|
||||
|
||||
# Add the target header file directory as an include path so that the
|
||||
# check for dpsNXargs.h below looks at the appropriate target includes
|
||||
ORIG_C_INCLUDE_PATH=${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_SYSTEM_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_LOCAL_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_USER_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
export C_INCLUDE_PATH
|
||||
|
||||
# We care about this header file on the target not host system
|
||||
AC_HAVE_HEADERS(DPS/dpsclient.h)
|
||||
|
||||
# Restore back to the original
|
||||
C_INCLUDE_PATH=${ORIG_C_INCLUDE_PATH}
|
||||
|
||||
AC_OUTPUT()
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue