mirror of
https://github.com/gnustep/tools-make.git
synced 2025-06-01 09:42:00 +00:00
Fix up dps configuration (again).
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2958 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
621cc07b67
commit
d6eb14e6bc
4 changed files with 132 additions and 3 deletions
|
|
@ -1,3 +1,8 @@
|
||||||
|
Thu Sep 3 15:19:57 1998 Adam Fedor <fedor@ultra.doc.com>
|
||||||
|
|
||||||
|
* configure.in: Check for DPS.
|
||||||
|
* config.make.in: Add DPS_DEFINE.
|
||||||
|
|
||||||
Tue Aug 25 10:02:03 1998 Adam Fedor <fedor@doc.com>
|
Tue Aug 25 10:02:03 1998 Adam Fedor <fedor@doc.com>
|
||||||
|
|
||||||
* openapp.in, debugapp.in: Fix typo. (patch from
|
* openapp.in, debugapp.in: Fix typo. (patch from
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,8 @@ ifeq ($(X_LIBS),-LNONE)
|
||||||
X_LIBS=
|
X_LIBS=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
DPS_DEFINE=@DPS_DEFINE@
|
||||||
|
|
||||||
# Any user specified libs, like thread libraries
|
# Any user specified libs, like thread libraries
|
||||||
CONFIG_SYSTEM_LIBS = @LIBS@
|
CONFIG_SYSTEM_LIBS = @LIBS@
|
||||||
|
|
||||||
|
|
|
||||||
87
configure
vendored
87
configure
vendored
|
|
@ -1450,6 +1450,86 @@ fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
# Find for DPS
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
if test -f clean_cpu.sh; then
|
||||||
|
transformed_host_cpu=`clean_cpu.sh $host_cpu`
|
||||||
|
transformed_target_cpu=`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 clean_os.sh; then
|
||||||
|
transformed_host_os=`clean_os.sh $host_os`
|
||||||
|
transformed_target_os=`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_CPPFLAGS=${CPPFLAGS}
|
||||||
|
CPPFLAGS="-I${GNUSTEP_SYSTEM_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||||
|
CPPFLAGS="-I${GNUSTEP_LOCAL_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||||
|
CPPFLAGS="-I${GNUSTEP_USER_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||||
|
CPPFLAGS="${CPPFLAGS} ${X_INCLUDE}"
|
||||||
|
|
||||||
|
# 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:1491: 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 1496 "configure"
|
||||||
|
#include "confdefs.h"
|
||||||
|
#include <$ac_hdr>
|
||||||
|
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*
|
||||||
|
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
|
||||||
|
DPS_DEFINE=' -DHAVE_DPS_CLIENT_H=1'
|
||||||
|
else
|
||||||
|
echo "$ac_t""no" 1>&6
|
||||||
|
DPS_DEFINE=' -DHAVE_DPS_CLIENT_H=0'
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
# Restore back to the original
|
||||||
|
CPPFLAGS=${ORIG_CPPFLAGS}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
# Setup the library combination
|
# Setup the library combination
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
|
|
@ -1476,18 +1556,18 @@ fi
|
||||||
# Check if libobjc was compiled with thread support.
|
# Check if libobjc was compiled with thread support.
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
|
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
|
||||||
echo "configure:1480: checking whether objc has thread support" >&5
|
echo "configure:1560: checking whether objc has thread support" >&5
|
||||||
saved_LIBS="$LIBS"
|
saved_LIBS="$LIBS"
|
||||||
LIBS="-lobjc $LIBS"
|
LIBS="-lobjc $LIBS"
|
||||||
if test "$cross_compiling" = yes; then
|
if test "$cross_compiling" = yes; then
|
||||||
objc_threaded=1
|
objc_threaded=1
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1487 "configure"
|
#line 1567 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include "config_thread.m"
|
#include "config_thread.m"
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
if { (eval echo configure:1571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||||
then
|
then
|
||||||
objc_threaded=1
|
objc_threaded=1
|
||||||
else
|
else
|
||||||
|
|
@ -1666,6 +1746,7 @@ s%@HOST_INSTALL@%$HOST_INSTALL%g
|
||||||
s%@LN_S@%$LN_S%g
|
s%@LN_S@%$LN_S%g
|
||||||
s%@X_INCLUDE@%$X_INCLUDE%g
|
s%@X_INCLUDE@%$X_INCLUDE%g
|
||||||
s%@X_LIBS@%$X_LIBS%g
|
s%@X_LIBS@%$X_LIBS%g
|
||||||
|
s%@DPS_DEFINE@%$DPS_DEFINE%g
|
||||||
s%@ac_cv_library_combo@%$ac_cv_library_combo%g
|
s%@ac_cv_library_combo@%$ac_cv_library_combo%g
|
||||||
s%@objc_threaded@%$objc_threaded%g
|
s%@objc_threaded@%$objc_threaded%g
|
||||||
|
|
||||||
|
|
|
||||||
41
configure.in
41
configure.in
|
|
@ -81,6 +81,47 @@ AC_HEADER_DIRENT
|
||||||
AC_HAVE_HEADERS(sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h dnl
|
AC_HAVE_HEADERS(sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h dnl
|
||||||
sys/stat.h sys/errno.h)
|
sys/stat.h sys/errno.h)
|
||||||
|
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
# Find for DPS
|
||||||
|
#--------------------------------------------------------------------
|
||||||
|
if test -f clean_cpu.sh; then
|
||||||
|
transformed_host_cpu=`clean_cpu.sh $host_cpu`
|
||||||
|
transformed_target_cpu=`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 clean_os.sh; then
|
||||||
|
transformed_host_os=`clean_os.sh $host_os`
|
||||||
|
transformed_target_os=`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_CPPFLAGS=${CPPFLAGS}
|
||||||
|
CPPFLAGS="-I${GNUSTEP_SYSTEM_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||||
|
CPPFLAGS="-I${GNUSTEP_LOCAL_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||||
|
CPPFLAGS="-I${GNUSTEP_USER_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||||
|
CPPFLAGS="${CPPFLAGS} ${X_INCLUDE}"
|
||||||
|
|
||||||
|
# We care about this header file on the target not host system
|
||||||
|
AC_HAVE_HEADERS(DPS/dpsclient.h, DPS_DEFINE=' -DHAVE_DPS_CLIENT_H=1',
|
||||||
|
DPS_DEFINE=' -DHAVE_DPS_CLIENT_H=0')
|
||||||
|
|
||||||
|
# Restore back to the original
|
||||||
|
CPPFLAGS=${ORIG_CPPFLAGS}
|
||||||
|
|
||||||
|
AC_SUBST(DPS_DEFINE)
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
# Setup the library combination
|
# Setup the library combination
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue