Don't add GNUSTEP_HDIR/GNUSTEP_LDIR to ADDITIONAL_INCLUDE_DIRS/ADDITIONAL_LIB_DIRS.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16928 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-06-15 12:59:02 +00:00
parent 5a3c3668c3
commit 31f4f76f01
3 changed files with 797 additions and 397 deletions

View file

@ -1,3 +1,9 @@
2003-06-15 14:57 Alexander Malmberg <alexander@malmberg.org>
* configure.ac: Don't add GNUSTEP_HDIR/GNUSTEP_LDIR to
ADDITIONAL_INCLUDE_DIRS/ADDITIONAL_LIB_DIRS.
configure: Regenerate.
2003-06-15 02:35 Alexander Malmberg <alexander@malmberg.org>
* Headers/gnustep/gui/GSNibTemplates.h, Source/NSBundleAdditions.m:

1164
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -41,6 +41,18 @@ AC_CONFIG_HEADER(Headers/gnustep/gui/config.h)
#--------------------------------------------------------------------
AC_CANONICAL_TARGET([])
#--------------------------------------------------------------------
# Add target OS directories as necessary
#--------------------------------------------------------------------
ADDITIONAL_INCLUDE_DIRS="$CPPFLAGS"
ADDITIONAL_LIB_DIRS="$LDFLAGS"
case "$target_os" in
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib";;
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
esac
#--------------------------------------------------------------------
# The following is so that headers and custom libraries
# in the GNUstep root are used before the standard ones
@ -58,18 +70,6 @@ fi
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
#--------------------------------------------------------------------
# Add target OS directories as necessary
#--------------------------------------------------------------------
ADDITIONAL_INCLUDE_DIRS="$CPPFLAGS"
ADDITIONAL_LIB_DIRS="$LDFLAGS"
case "$target_os" in
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib";;
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
esac
#--------------------------------------------------------------------
# Find the compiler
#--------------------------------------------------------------------