gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 23:42:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated for filesystem update

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24581 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-15 00:20:28 +00:00
parent a28b671c2f
commit 368694c180
3 changed files with 3490 additions and 3797 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-02-15 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac: Source GNUstep.sh then use GNUSTEP_SYSTEM_HEADERS
and GNUSTEP_SYSTEM_LIBRARIES if available rather than using
hardcoded paths.
* configure: Regenerated.
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
* Fonts/GNUmakefile (back-resources_INSTALL_DIR): New variable.

7249
configure vendored
View file

File diff suppressed because it is too large Load diff

31
configure.ac
View file

@ -52,17 +52,38 @@ AC_CANONICAL_TARGET([])
GRAPHIC_CFLAGS="$CPPFLAGS"
GRAPHIC_LFLAGS="$LDFLAGS"
# Set location of GNUstep dirs for later use
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
#
# It looks like we ought to source the whole GNUstep.sh here, and even
# ask it to output all variables! That way we have access to (eg)
# GNUSTEP_SYSTEM_HEADERS below.
#
GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
. "$GNUSTEP_MAKEFILES/GNUstep.sh"
unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
# GNUSTEP_SYSTEM_ROOT if not set yet.
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
if test x"$GNUSTEP_IS_FLATTENED" = x""; then
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
else
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
fi
fi
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
fi
if test "$GNUSTEP_IS_FLATTENED" = no; then
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
else
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
fi
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
#--------------------------------------------------------------------