mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-30 00:41:14 +00:00
configure and library-combo fixes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2938 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
0b445b148c
commit
60a003ba83
8 changed files with 77 additions and 32 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
Thu Aug 20 11:41:48 1998 Adam Fedor <fedor@doc.com>
|
||||
|
||||
* openapp.in, debugapp.in: Set LIBRARY_COMBO only if not set.
|
||||
* brain.make: Likewise for library_combo.
|
||||
* GNUstep.csh: Add braces around some variables (Changes from
|
||||
Christopher Seawood <cls@seawood.org>).
|
||||
* ld_lib_path.sh,ld_lib_path.csh: Check if variables set before
|
||||
changing.
|
||||
* whichlib.c: Fixup dirent includes.
|
||||
|
||||
Wed Aug 12 15:25:00 1998 Richard Frith-Macdonald <richard@brainstrom.co.uk>
|
||||
|
||||
* openapp.in: export LIBRARY_COMBO.
|
||||
|
|
|
|||
|
|
@ -33,28 +33,28 @@ setenv GNUSTEP_USER_ROOT ~/GNUstep
|
|||
#
|
||||
# Determine the host information
|
||||
#
|
||||
setenv GNUSTEP_HOST `$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
|
||||
setenv GNUSTEP_HOST_CPU `$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
|
||||
setenv GNUSTEP_HOST_VENDOR `$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_HOST`
|
||||
setenv GNUSTEP_HOST_OS `$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
|
||||
setenv GNUSTEP_HOST `$$(GNUSTEP_SYSTEM_ROOT}/Makefiles/config.guess`
|
||||
setenv GNUSTEP_HOST_CPU `$$(GNUSTEP_SYSTEM_ROOT}/Makefiles/cpu.sh $GNUSTEP_HOST`
|
||||
setenv GNUSTEP_HOST_VENDOR `$(GNUSTEP_SYSTEM_ROOT}/Makefiles/vendor.sh $GNUSTEP_HOST`
|
||||
setenv GNUSTEP_HOST_OS `$(GNUSTEP_SYSTEM_ROOT}/Makefiles/os.sh $GNUSTEP_HOST`
|
||||
|
||||
# Clean the host
|
||||
setenv GNUSTEP_HOST_CPU `$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
setenv GNUSTEP_HOST_VENDOR `$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
setenv GNUSTEP_HOST_OS `$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
setenv GNUSTEP_HOST_CPU `$(GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
setenv GNUSTEP_HOST_VENDOR `$(GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
setenv GNUSTEP_HOST_OS `$(GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
|
||||
#
|
||||
# Add the GNUstep tools directories to the path
|
||||
#
|
||||
setenv PATH $GNUSTEP_SYSTEM_ROOT/Tools:$PATH
|
||||
setenv PATH $GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
|
||||
setenv PATH $GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
|
||||
setenv PATH $GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
|
||||
setenv PATH $GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
|
||||
setenv PATH $GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
|
||||
setenv PATH $GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
|
||||
setenv PATH $(GNUSTEP_SYSTEM_ROOT}/Tools:$PATH
|
||||
setenv PATH $(GNUSTEP_SYSTEM_ROOT}/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/${LIBRARY_COMBO}:$PATH
|
||||
setenv PATH $(GNUSTEP_SYSTEM_ROOT}/Tools/$GNUSTEP_HOST_CPU/${GNUSTEP_HOST_OS}:$PATH
|
||||
setenv PATH $GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/${LIBRARY_COMBO}:$PATH
|
||||
setenv PATH $GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/${GNUSTEP_HOST_OS}:$PATH
|
||||
setenv PATH $GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/${LIBRARY_COMBO}:$PATH
|
||||
setenv PATH $GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/${GNUSTEP_HOST_OS}:$PATH
|
||||
|
||||
source $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.csh
|
||||
source $(GNUSTEP_SYSTEM_ROOT}/Makefiles/ld_lib_path.csh
|
||||
|
||||
#
|
||||
# Perform any user initialization
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
#
|
||||
# brain.make
|
||||
#
|
||||
|
|
@ -21,6 +22,11 @@
|
|||
|
||||
# Handle abbreviations for library combinations
|
||||
|
||||
ifndef library_combo
|
||||
ifdef LIBRARY_COMBO
|
||||
library_combo:=$(LIBRARY_COMBO)
|
||||
endif
|
||||
endif
|
||||
ifdef library_combo
|
||||
the_library_combo=$(library_combo)
|
||||
else
|
||||
|
|
|
|||
|
|
@ -27,7 +27,9 @@ if [ -z "$1" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
LIBRARY_COMBO=@ac_cv_library_combo@
|
||||
if [ -z "$LIBRARY_COMBO ]; then
|
||||
LIBRARY_COMBO=@ac_cv_library_combo@
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
--library-combo=*)
|
||||
|
|
@ -46,6 +48,8 @@ if [ "$LIBRARY_COMBO" = nx ]; then
|
|||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -37,8 +37,12 @@ endif
|
|||
switch ( "${host_os}" )
|
||||
|
||||
case *nextstep4* :
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${DYLD_LIBRARY_PATH}"
|
||||
if ( "${additional_library_paths}" != "" ) then
|
||||
if ( $?DYLD_LIBRARY_PATH == 0 ) then
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}"
|
||||
else
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${DYLD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_library_paths == 1) then
|
||||
foreach dir (${additional_library_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
|
|
@ -50,8 +54,12 @@ switch ( "${host_os}" )
|
|||
breaksw
|
||||
|
||||
case * :
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${LD_LIBRARY_PATH}"
|
||||
if ( "${additional_library_paths}" != ) then
|
||||
if ( $?LD_LIBRARY_PATH == 0 ) then
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}"
|
||||
else
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_library_paths == 1) then
|
||||
foreach dir (${additional_library_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -40,7 +40,11 @@ IFS="
|
|||
case "$host_os" in
|
||||
|
||||
*nextstep4*)
|
||||
DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$DYLD_LIBRARY_PATH"
|
||||
if [ -z $DYLD_LIBRARY_PATH ]; then
|
||||
DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part"
|
||||
else
|
||||
DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$DYLD_LIBRARY_PATH"
|
||||
fi
|
||||
if [ -n "$additional_library_paths" ]; then
|
||||
for dir in $additional_library_paths; do
|
||||
additional="${additional}${dir}:"
|
||||
|
|
@ -51,7 +55,11 @@ case "$host_os" in
|
|||
;;
|
||||
|
||||
*)
|
||||
LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$LD_LIBRARY_PATH"
|
||||
if [ -z $LD_LIBRARY_PATH ]; then
|
||||
LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part"
|
||||
else
|
||||
LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$LD_LIBRARY_PATH"
|
||||
fi
|
||||
if [ -n "$additional_library_paths" ]; then
|
||||
for dir in $additional_library_paths; do
|
||||
additional="${additional}${dir}:"
|
||||
|
|
|
|||
|
|
@ -27,7 +27,9 @@ if [ -z "$1" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
LIBRARY_COMBO=@ac_cv_library_combo@
|
||||
if [ -z "$LIBRARY_COMBO ]; then
|
||||
LIBRARY_COMBO=@ac_cv_library_combo@
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
--library_combo=*)
|
||||
|
|
@ -47,6 +49,8 @@ if [ "$LIBRARY_COMBO" = nx ]; then
|
|||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
fi
|
||||
|
|
|
|||
23
which_lib.c
23
which_lib.c
|
|
@ -59,16 +59,21 @@
|
|||
|
||||
#include <fcntl.h>
|
||||
|
||||
#if defined(HAVE_DIRENT_H)
|
||||
#if HAVE_DIRENT_H
|
||||
# include <dirent.h>
|
||||
#elif defined(HAVE_SYS_DIR_H)
|
||||
# include <sys/dir.h>
|
||||
#elif defined(HAVE_SYS_NDIR_H)
|
||||
# include <sys/ndir.h>
|
||||
#elif defined(HAVE_NDIR_H)
|
||||
# include <ndir.h>
|
||||
#elif defined(HAVE_DIR_H)
|
||||
# include <dir.h>
|
||||
# define NAMLEN(dirent) strlen((dirent)->d_name)
|
||||
#else
|
||||
# define dirent direct
|
||||
# define NAMLEN(dirent) (dirent)->d_namlen
|
||||
# if HAVE_SYS_NDIR_H
|
||||
# include <sys/ndir.h>
|
||||
# endif
|
||||
# if HAVE_SYS_DIR_H
|
||||
# include <sys/dir.h>
|
||||
# endif
|
||||
# if HAVE_NDIR_H
|
||||
# include <ndir.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if !defined(_POSIX_VERSION)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue