mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Correct problem where *bsd lib flags were not getting used.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17810 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
aebfc654f2
commit
02015f405f
5 changed files with 21 additions and 8 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2003-10-09 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Correct problem where *bsd lib flags were not getting used.
|
||||
* configure.ac: Use LIB_DIR not LDFLAGS
|
||||
* config.make.in (CONFIG_SYSTEM_LIB_DIR): New var for LIB_DIRs
|
||||
* library-combo.make (SYSTEM_LIB_DIR): Use it.
|
||||
|
||||
2003-10-05 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Version: Bump to 1.8.90
|
||||
|
|
|
|||
|
|
@ -108,6 +108,7 @@ endif
|
|||
# Any user specified libs
|
||||
CONFIG_SYSTEM_INCL=@INCLUDES@
|
||||
CONFIG_SYSTEM_LIBS = @LIBS@
|
||||
CONFIG_SYSTEM_LIB_DIR = @LIB_DIR@
|
||||
|
||||
#
|
||||
# Whether the C/ObjC/C++ compiler supports auto-dependencies
|
||||
|
|
|
|||
11
configure
vendored
11
configure
vendored
|
|
@ -317,7 +317,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_ROOT root_prefix MAKEFILES_SUFFIX HOST_INSTALL GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE EGREP objc_threaded ac_cv_objc_threaded AUTO_DEPENDENCIES INCLUDES OBJC_NO_IMPORT_FLAGS GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_ROOT root_prefix MAKEFILES_SUFFIX HOST_INSTALL GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE EGREP objc_threaded ac_cv_objc_threaded AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJC_NO_IMPORT_FLAGS GNUSTEP_MOVE_OBSOLETE GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -2550,12 +2550,13 @@ OBJC_RUNTIME_LIB=`echo $ac_cv_library_combo | awk -F- '{print $1}'`
|
|||
# specific target_os options
|
||||
#--------------------------------------------------------------------
|
||||
INCLUDES=
|
||||
LIB_DIR=
|
||||
case "$target_os" in
|
||||
freebsd* | openbsd* )
|
||||
INCLUDES="-I/usr/local/include"
|
||||
LDFLAGS="$LDFLAGS -L/usr/local/lib";;
|
||||
LIB_DIR="-L/usr/local/lib";;
|
||||
netbsd*) INCLUDES="-I/usr/pkg/include"
|
||||
LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
|
||||
LIB_DIR="-Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
|
||||
esac
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -3305,7 +3306,7 @@ if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
|||
else
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
# And the following to execute them
|
||||
|
|
@ -4530,6 +4531,7 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
# Enable/disable warnings for deprecated #import directive as required
|
||||
#---------------------------------------------------------------------
|
||||
|
|
@ -5294,6 +5296,7 @@ s,@objc_threaded@,$objc_threaded,;t t
|
|||
s,@ac_cv_objc_threaded@,$ac_cv_objc_threaded,;t t
|
||||
s,@AUTO_DEPENDENCIES@,$AUTO_DEPENDENCIES,;t t
|
||||
s,@INCLUDES@,$INCLUDES,;t t
|
||||
s,@LIB_DIR@,$LIB_DIR,;t t
|
||||
s,@OBJC_NO_IMPORT_FLAGS@,$OBJC_NO_IMPORT_FLAGS,;t t
|
||||
s,@GNUSTEP_MOVE_OBSOLETE@,$GNUSTEP_MOVE_OBSOLETE,;t t
|
||||
s,@GNUSTEP_MAKE_VERSION@,$GNUSTEP_MAKE_VERSION,;t t
|
||||
|
|
|
|||
|
|
@ -62,12 +62,13 @@ OBJC_RUNTIME_LIB=`echo $ac_cv_library_combo | awk -F- '{print $1}'`
|
|||
# specific target_os options
|
||||
#--------------------------------------------------------------------
|
||||
INCLUDES=
|
||||
LIB_DIR=
|
||||
case "$target_os" in
|
||||
freebsd* | openbsd* )
|
||||
INCLUDES="-I/usr/local/include"
|
||||
LDFLAGS="$LDFLAGS -L/usr/local/lib";;
|
||||
LIB_DIR="-L/usr/local/lib";;
|
||||
netbsd*) INCLUDES="-I/usr/pkg/include"
|
||||
LDFLAGS="$LDFLAGS -Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
|
||||
LIB_DIR="-Wl,-R/usr/pkg/lib -L/usr/pkg/lib";;
|
||||
esac
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -349,7 +350,7 @@ if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
|||
else
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
# And the following to execute them
|
||||
|
|
@ -490,6 +491,7 @@ fi
|
|||
|
||||
AC_SUBST(AUTO_DEPENDENCIES)
|
||||
AC_SUBST(INCLUDES)
|
||||
AC_SUBST(LIB_DIR)
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
# Enable/disable warnings for deprecated #import directive as required
|
||||
|
|
|
|||
|
|
@ -217,5 +217,5 @@ endif
|
|||
|
||||
SYSTEM_INCLUDES = $(CONFIG_SYSTEM_INCL)
|
||||
SYSTEM_LDFLAGS = $(LDFLAGS)
|
||||
SYSTEM_LIB_DIR =
|
||||
SYSTEM_LIB_DIR = $(CONFIG_SYSTEM_LIB_DIR)
|
||||
SYSTEM_LIBS =
|
||||
|
|
|
|||
Loading…
Reference in a new issue