mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 14:20:50 +00:00
Remove old/incorrect CPPFLAGS/LDFLAGS.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12403 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
354c38c76d
commit
8b7a0ba99c
9 changed files with 164 additions and 94 deletions
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
2002-02-03 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Remove setting of GCC_SO_DIR. Remove CPPFLAGS
|
||||
and LDFLAGS with GNUSTEP paths in them since they are already
|
||||
included in default rules. Set OBJC_CPPFLAGS/LDFLAGS for objc
|
||||
thread test.
|
||||
* GNUstep.csh.in: Remove GCC_SO_DIR
|
||||
* GNUstep.sh.in: Likewise.
|
||||
* ld_lib_path.csh: Likewise.
|
||||
* ld_lib_path.sh: Likewise.
|
||||
|
||||
* Documentation/userfaq.texi: New file.
|
||||
|
||||
Sat Feb 2 10:54:35 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* GNUstep.sh.in (GNUSTEP_USER_ROOT): Fixed typo.
|
||||
|
|
|
|||
|
|
@ -160,6 +160,14 @@ export CC="gcc -mno-cygwin"
|
|||
shared libraries. Even static libraries based on C (e.g. libtiff) will
|
||||
prevent Objective-C modules from being loaded in Objective-C libraries.
|
||||
|
||||
[3] On Windows XP, at least, there are sometimes spaces in the path to the
|
||||
user directory. The make program cannot deal with this. One potential solution
|
||||
is to re-define the GNUSTEP_USER_ROOT location so it doesn't have spaces:
|
||||
|
||||
./configure --with-user-root='/home/$USERNAME/GNUstep'
|
||||
|
||||
is a good alternative.
|
||||
|
||||
Good Sites for Pre-Compiled Binaries
|
||||
------------------------------------
|
||||
|
||||
|
|
|
|||
95
Documentation/userfaq.texi
Normal file
95
Documentation/userfaq.texi
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
\input texinfo @c -*-texinfo-*-
|
||||
@c A FAQ for GNUstep Users
|
||||
|
||||
@node Top, GNUstep General Information, (dir), (dir)
|
||||
@chapter GNUstep Frequently Asked Questions for Users
|
||||
|
||||
Last updated @today{}
|
||||
Please send corrections to @email{gnustep-maintainer@@gnu.org}.
|
||||
|
||||
@menu
|
||||
* GNUstep General Information::
|
||||
* Troubleshooting::
|
||||
@end menu
|
||||
|
||||
@node GNUstep General Information, Troubleshooting, Top, Top
|
||||
@section GNUstep General Information
|
||||
|
||||
@menu
|
||||
* What is GNUstep?::
|
||||
* How can I get GNUstep?::
|
||||
* How do you run GNUstep?::
|
||||
* Is there a web site?::
|
||||
@end menu
|
||||
|
||||
@node What is GNUstep?, How can I get GNUstep?, GNUstep General Information, GNUstep General Information
|
||||
@subsection What is GNUstep?
|
||||
|
||||
GNUstep is the Free Software Foundation's effort to implement NeXT
|
||||
Software Inc.'s (now Apple Inc.) OpenStep Standard. The project is not
|
||||
finished, so some parts are not as polished as they could be.
|
||||
|
||||
@node How can I get GNUstep?, How do you run GNUstep?, What is GNUstep?, GNUstep General Information
|
||||
@subsection How can I get GNUstep?
|
||||
|
||||
Get the HOWTO from
|
||||
@url{http://www.gnustep.org/resources/documentation/GNUstep-HOWTO}
|
||||
Get the latest release from @url{ftp://ftp.gnustep.org}. If you're
|
||||
really adventurous, get the latest snapshot by anonymous ftp from
|
||||
@url{ftp://ftp.gnustep.org:/pub/daily-snapshots}
|
||||
|
||||
Use anonymous CVS to keep up to date - instructions are in the
|
||||
HOWTO.
|
||||
|
||||
@node How do you run GNUstep?, Is there a web site?, How can I get GNUstep?, GNUstep General Information
|
||||
@subsection How do you run GNUstep?
|
||||
|
||||
You are presumably under the misapprehension that GNUstep is
|
||||
some sort of window manager.
|
||||
|
||||
It isn't.
|
||||
|
||||
GNUstep is a whole load of things - primarily a set of libraries
|
||||
for developing software.
|
||||
|
||||
At present, it's those libraries, plus various command-line based
|
||||
support tools and service providing daemons. In the future, it
|
||||
will be the libraries, plus the support tools, plus various GUI
|
||||
development tools, a GUI desktop/workspace application etc.
|
||||
|
||||
At no stage will you ever 'run' GNUstep - you will run applications
|
||||
and tools and will make use of it's services (though at some point
|
||||
you may well find packages distributed as 'GNUstep' systems in the
|
||||
way that you get 'Linux' systems packaged today).
|
||||
|
||||
If you want to see a sample GUI application running you need to build
|
||||
GNUstep and look at the example applications in the gstep-examples
|
||||
package. Build 'Finger' or 'Ink' and start it with 'openapp Finger.app'
|
||||
or 'openapp Ink.app'
|
||||
|
||||
To look best - use WindowMaker (the currently preferred GNUstep
|
||||
window manager) as your window manager.
|
||||
|
||||
@node Is there a web site?, , How do you run GNUstep?, GNUstep General Information
|
||||
@subsection Is there a web site?
|
||||
|
||||
See @url{http://www.gnustep.org/}.
|
||||
|
||||
@c ****************************************************************
|
||||
@node Troubleshooting, , GNUstep General Information, Top
|
||||
@section Troubleshooting
|
||||
|
||||
@menu
|
||||
* Problems with Alt key::
|
||||
@end menu
|
||||
|
||||
@node Problems with Alt key, , Troubleshooting, Troubleshooting
|
||||
@subsection Problems with Alt key
|
||||
|
||||
If you are using WindowMaker, it's possible it is grabing this key and
|
||||
using it for itself. To check, open Window Maker's WPrefs and go to the
|
||||
Mouse Preferences. Then use another value for the "Mouse grab modifier"
|
||||
(bottom right). That will allow you to alt-drag things.
|
||||
|
||||
@bye
|
||||
\bye
|
||||
|
|
@ -90,10 +90,6 @@ else if ( { (echo "$PATH" | fgrep -v "$temp_path" >/dev/null) } ) then
|
|||
endif
|
||||
unset temp_path dir
|
||||
|
||||
|
||||
# directory for gcc's 3.x shared libraries
|
||||
setenv GCC_SO_DIR @GCC_SO_DIR@
|
||||
|
||||
source ${GNUSTEP_MAKEFILES}/ld_lib_path.csh
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -151,9 +151,6 @@ fi
|
|||
unset temp_path
|
||||
export PATH
|
||||
|
||||
# directory for gcc's 3.x shared libraries
|
||||
GCC_SO_DIR=@GCC_SO_DIR@
|
||||
export GCC_SO_DIR
|
||||
. $GNUSTEP_MAKEFILES/ld_lib_path.sh
|
||||
|
||||
if [ "$convert_win_paths" = "yes" ]; then
|
||||
|
|
|
|||
91
configure
vendored
91
configure
vendored
|
|
@ -1743,29 +1743,15 @@ fi
|
|||
|
||||
echo "$ac_t""$gs_cv_objc_libdir" 1>&6
|
||||
|
||||
# FIXME: There is a reference problem here, since gnustep-make
|
||||
# needs to be installed before other libraries, but if so, then
|
||||
# we will end up not including these dirs. For now, just include them
|
||||
# all the time:
|
||||
GCC_SO_DIR=NONE
|
||||
#if test "$gs_cv_objc_libdir" != "NONE"; then
|
||||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$prefix/Headers"
|
||||
else
|
||||
GCC_SO_DIR="$gs_cv_objc_libdir"
|
||||
fi
|
||||
LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
|
||||
# And the following to execute them
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gs_cv_objc_libdir"
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
#fi
|
||||
|
||||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
OBJC_CPPFLAGS="$CPPFLAGS -I$prefix/Headers"
|
||||
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
# And the following to execute them
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gs_cv_objc_libdir"
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Miscellaneous headers (only used for compiling which_lib.c)
|
||||
|
|
@ -1775,12 +1761,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
|
||||
echo "configure:1779: checking for $ac_hdr that defines DIR" >&5
|
||||
echo "configure:1765: checking for $ac_hdr that defines DIR" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1784 "configure"
|
||||
#line 1770 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
|
|
@ -1788,7 +1774,7 @@ int main() {
|
|||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
|
|
@ -1813,7 +1799,7 @@ done
|
|||
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
|
||||
if test $ac_header_dirent = dirent.h; then
|
||||
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
|
||||
echo "configure:1817: checking for opendir in -ldir" >&5
|
||||
echo "configure:1803: checking for opendir in -ldir" >&5
|
||||
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1821,7 +1807,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1825 "configure"
|
||||
#line 1811 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -1832,7 +1818,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1854,7 +1840,7 @@ fi
|
|||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:1858: checking for opendir in -lx" >&5
|
||||
echo "configure:1844: checking for opendir in -lx" >&5
|
||||
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1862,7 +1848,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1866 "configure"
|
||||
#line 1852 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -1873,7 +1859,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1899,17 +1885,17 @@ for ac_hdr in sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h sys/s
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:1903: checking for $ac_hdr" >&5
|
||||
echo "configure:1889: 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 1908 "configure"
|
||||
#line 1894 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1952,7 +1938,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
|
||||
echo "configure:1956: checking whether objc has thread support" >&5
|
||||
echo "configure:1942: checking whether objc has thread support" >&5
|
||||
extra_LIBS=""
|
||||
case "${target_os}" in
|
||||
solaris*)
|
||||
|
|
@ -1961,7 +1947,7 @@ case "${target_os}" in
|
|||
esac
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
saved_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS -x objective-c -I$srcdir"
|
||||
CFLAGS="$CFLAGS -x objective-c -I$srcdir $OBJC_CPPFLAGS $OBJC_LDFLAGS"
|
||||
if test "$OBJC_RUNTIME_LIB" = "nx"; then
|
||||
CFLAGS="$CFLAGS -DNeXT_RUNTIME"
|
||||
fi
|
||||
|
|
@ -1971,11 +1957,11 @@ if test "$OBJC_THREAD" != ""; then
|
|||
objc_threaded=""
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1975 "configure"
|
||||
#line 1961 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="$OBJC_THREAD $extra_LIBS"
|
||||
else
|
||||
|
|
@ -1993,11 +1979,11 @@ elif test "$host_os" = linux-gnu; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1997 "configure"
|
||||
#line 1983 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -2015,11 +2001,11 @@ elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then
|
|||
objc_threaded="-pthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2019 "configure"
|
||||
#line 2005 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-pthread"
|
||||
else
|
||||
|
|
@ -2037,11 +2023,11 @@ fi
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2041 "configure"
|
||||
#line 2027 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -2060,11 +2046,11 @@ fi
|
|||
objc_threaded="-lpcthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2064 "configure"
|
||||
#line 2050 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpcthread"
|
||||
else
|
||||
|
|
@ -2084,11 +2070,11 @@ elif test "$MINGW32" = yes; then
|
|||
objc_threaded="works"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2088 "configure"
|
||||
#line 2074 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="works"
|
||||
else
|
||||
|
|
@ -2106,11 +2092,11 @@ else
|
|||
objc_threaded=""
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2110 "configure"
|
||||
#line 2096 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lthread $extra_LIBS"
|
||||
else
|
||||
|
|
@ -2142,7 +2128,7 @@ ac_cv_objc_threaded="$objc_threaded"
|
|||
#--------------------------------------------------------------------
|
||||
|
||||
echo $ac_n "checking if the compiler supports autodependencies""... $ac_c" 1>&6
|
||||
echo "configure:2146: checking if the compiler supports autodependencies" >&5
|
||||
echo "configure:2132: checking if the compiler supports autodependencies" >&5
|
||||
|
||||
# What we want to do: set AUTO_DEPENDENCIES to yes if gcc => 3.x
|
||||
|
||||
|
|
@ -2176,7 +2162,7 @@ fi
|
|||
# Record the version
|
||||
#--------------------------------------------------------------------
|
||||
echo $ac_n "checking for the version of gnustep-make we are compiling""... $ac_c" 1>&6
|
||||
echo "configure:2180: checking for the version of gnustep-make we are compiling" >&5
|
||||
echo "configure:2166: checking for the version of gnustep-make we are compiling" >&5
|
||||
. "$srcdir/Version"
|
||||
echo "$ac_t""$GNUSTEP_MAKE_VERSION" 1>&6
|
||||
|
||||
|
|
@ -2360,7 +2346,6 @@ s%@GNUSTEP_USER_ROOT@%$GNUSTEP_USER_ROOT%g
|
|||
s%@GNUSTEP_FLATTENED@%$GNUSTEP_FLATTENED%g
|
||||
s%@BACKEND_BUNDLE@%$BACKEND_BUNDLE%g
|
||||
s%@FORCE_CPPFLAGS@%$FORCE_CPPFLAGS%g
|
||||
s%@GCC_SO_DIR@%$GCC_SO_DIR%g
|
||||
s%@objc_threaded@%$objc_threaded%g
|
||||
s%@ac_cv_objc_threaded@%$ac_cv_objc_threaded%g
|
||||
s%@AUTO_DEPENDENCIES@%$AUTO_DEPENDENCIES%g
|
||||
|
|
|
|||
32
configure.in
32
configure.in
|
|
@ -296,29 +296,15 @@ fi
|
|||
])
|
||||
AC_MSG_RESULT($gs_cv_objc_libdir)
|
||||
|
||||
# FIXME: There is a reference problem here, since gnustep-make
|
||||
# needs to be installed before other libraries, but if so, then
|
||||
# we will end up not including these dirs. For now, just include them
|
||||
# all the time:
|
||||
GCC_SO_DIR=NONE
|
||||
#if test "$gs_cv_objc_libdir" != "NONE"; then
|
||||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$prefix/Headers"
|
||||
else
|
||||
GCC_SO_DIR="$gs_cv_objc_libdir"
|
||||
fi
|
||||
LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
|
||||
# And the following to execute them
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gs_cv_objc_libdir"
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
#fi
|
||||
|
||||
AC_SUBST(GCC_SO_DIR)
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
OBJC_CPPFLAGS="$CPPFLAGS -I$prefix/Headers"
|
||||
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
# And the following to execute them
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gs_cv_objc_libdir"
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Miscellaneous headers (only used for compiling which_lib.c)
|
||||
|
|
@ -347,7 +333,7 @@ case "${target_os}" in
|
|||
esac
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
saved_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS -x objective-c -I$srcdir"
|
||||
CFLAGS="$CFLAGS -x objective-c -I$srcdir $OBJC_CPPFLAGS $OBJC_LDFLAGS"
|
||||
if test "$OBJC_RUNTIME_LIB" = "nx"; then
|
||||
CFLAGS="$CFLAGS -DNeXT_RUNTIME"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -64,9 +64,6 @@ switch ( "${host_os}" )
|
|||
else
|
||||
setenv SHLIB_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${SHLIB_PATH}"
|
||||
endif
|
||||
if ( "${GCC_SO_DIR}" != "NONE" ) then
|
||||
setenv SHLIB_PATH="${LD_LIBRARY_PATH}:${GCC_SO_DIR}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
|
|
@ -83,9 +80,6 @@ switch ( "${host_os}" )
|
|||
setenv LD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
|
||||
if ( "${GCC_SO_DIR}" != "NONE" ) then
|
||||
setenv LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GCC_SO_DIR}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
|
|
|
|||
|
|
@ -45,10 +45,6 @@ else
|
|||
lib_paths="$GNUSTEP_USER_ROOT/Libraries:$GNUSTEP_LOCAL_ROOT/Libraries:$GNUSTEP_NETWORK_ROOT/Libraries:$GNUSTEP_SYSTEM_ROOT/Libraries"
|
||||
fi
|
||||
|
||||
if [ -n "$GCC_SO_DIR" -a "$GCC_SO_DIR" != "NONE" ]; then
|
||||
lib_paths="${lib_paths}:${GCC_SO_DIR}"
|
||||
fi
|
||||
|
||||
if [ -n "$additional_library_paths" ]; then
|
||||
for dir in $additional_library_paths; do
|
||||
additional="${additional}${dir}:"
|
||||
|
|
@ -120,4 +116,4 @@ export GUILE_LOAD_PATH
|
|||
unset guile_paths
|
||||
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
unset old_IFS
|
||||
|
|
|
|||
Loading…
Reference in a new issue