mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-10 08:10:49 +00:00
Clean up config flags
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15148 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
98524d8d1c
commit
32f7a6bc8b
6 changed files with 31 additions and 4 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2002-11-27 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.ac (INCLUDE_FLAGS): New for holding flags needed for
|
||||
compiling base.
|
||||
* config.make.in (CONFIG_SYSTEM_INCL): Use it.
|
||||
* base.make (CONFIG_SYSTEM_INCL): Remove CPPFLAGS
|
||||
(CONFIG_SYSTEM_DEFS): Remove.
|
||||
* Source/Additions/GNUmakefile: include config.mak
|
||||
|
||||
2002-11-27 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/Additions/GSObjCRuntime.m: New file with GNUstep extensions
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
|
|||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../base.make
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
include ../../config.mak
|
||||
|
||||
SUBPROJECT_NAME=Additions
|
||||
|
||||
|
|
|
|||
|
|
@ -27,9 +27,8 @@ ifeq ($(FOUNDATION_LIB),gnu)
|
|||
#
|
||||
# FIXME - macro names
|
||||
#
|
||||
CONFIG_SYSTEM_INCL += @CPPFLAGS@ @NX_CONST_STRING_CPPFLAGS@
|
||||
CONFIG_SYSTEM_INCL += @NX_CONST_STRING_CPPFLAGS@
|
||||
CONFIG_SYSTEM_LIBS += @LIBS@
|
||||
CONFIG_SYSTEM_DEFS += @SYSTEM_DEFS@
|
||||
|
||||
GNUSTEP_BASE_VERSION = @VERSION@
|
||||
GNUSTEP_BASE_MAJOR_VERSION = @MAJOR_VERSION@
|
||||
|
|
|
|||
|
|
@ -11,3 +11,5 @@ HAVE_LIBXML=@HAVE_LIBXML@
|
|||
WITH_FFI=@WITH_FFI@
|
||||
|
||||
HAVE_PTHREAD_H=@HAVE_PTHREAD_H@
|
||||
|
||||
CONFIG_SYSTEM_INCL += @INCLUDE_FLAGS@
|
||||
|
|
|
|||
11
configure
vendored
11
configure
vendored
|
|
@ -2335,6 +2335,10 @@ fi
|
|||
#--------------------------------------------------------------------
|
||||
# specific target_os options
|
||||
#--------------------------------------------------------------------
|
||||
# CPPFLAGS are not used anywhere except during configuration. If they
|
||||
# are needed, they should have been set when configuring gnustep-make
|
||||
# INCLUDE_FLAGS will go into base.make(CONFIG_SYSTEM_INCL)
|
||||
INCLUDE_FLAGS=""
|
||||
case "$target_os" in
|
||||
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
LDFLAGS="$LDFLAGS -L/usr/local/lib";;
|
||||
|
|
@ -6316,6 +6320,8 @@ fi
|
|||
|
||||
fi
|
||||
|
||||
# NB: This is used as follows: in Source/Makefile.postamble we copy
|
||||
# $(DYNAMIC_LINKER)-load.h into dynamic-load.h
|
||||
echo "$as_me:$LINENO: checking for dynamic linker type" >&5
|
||||
echo $ECHO_N "checking for dynamic linker type... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: result: $DYNAMIC_LINKER" >&5
|
||||
|
|
@ -11577,6 +11583,7 @@ echo "${ECHO_T}no" >&6
|
|||
|
||||
if test $enable_libxml = yes; then
|
||||
CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
|
||||
INCLUDE_FLAGS="$INCLUDE_FLAGS $XML_CFLAGS"
|
||||
LIBS="$LIBS $XML_LIBS"
|
||||
HAVE_LIBXML=1
|
||||
|
||||
|
|
@ -11618,6 +11625,7 @@ libs_temp=$LIBS
|
|||
|
||||
if test "$gmp_incdir" != "no"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$gmp_incdir"
|
||||
INCLUDE_FLAGS="$INCLUDE_FLAGS -I$gmp_incdir"
|
||||
fi
|
||||
if test "$gmp_libdir" != "no"; then
|
||||
LIBS="$LIBS -L$gmp_libdir"
|
||||
|
|
@ -11970,6 +11978,7 @@ fi;
|
|||
|
||||
if test "$libiconv_libdir" != "no"; then
|
||||
CPPFLAGS="$CPPFLAGS -L$libiconv_libdir"
|
||||
INCLUDE_FLAGS="$INCLUDE_FLAGS -L$libiconv_libdir"
|
||||
fi
|
||||
|
||||
# BSDs install this lib as libgiconv
|
||||
|
|
@ -12761,7 +12770,7 @@ s,@XML_CFLAGS@,$XML_CFLAGS,;t t
|
|||
s,@XML_LIBS@,$XML_LIBS,;t t
|
||||
s,@HAVE_LIBXML@,$HAVE_LIBXML,;t t
|
||||
s,@USE_GMP@,$USE_GMP,;t t
|
||||
s,@SYSTEM_DEFS@,$SYSTEM_DEFS,;t t
|
||||
s,@INCLUDE_FLAGS@,$INCLUDE_FLAGS,;t t
|
||||
s,@subdirs@,$subdirs,;t t
|
||||
s,@VERSION@,$VERSION,;t t
|
||||
s,@MAJOR_VERSION@,$MAJOR_VERSION,;t t
|
||||
|
|
|
|||
|
|
@ -60,6 +60,10 @@ AC_PATH_PROG(WHOAMI, whoami, echo, $PATH:/usr/ucb)
|
|||
#--------------------------------------------------------------------
|
||||
# specific target_os options
|
||||
#--------------------------------------------------------------------
|
||||
# CPPFLAGS are not used anywhere except during configuration. If they
|
||||
# are needed, they should have been set when configuring gnustep-make
|
||||
# INCLUDE_FLAGS will go into base.make(CONFIG_SYSTEM_INCL)
|
||||
INCLUDE_FLAGS=""
|
||||
case "$target_os" in
|
||||
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
LDFLAGS="$LDFLAGS -L/usr/local/lib";;
|
||||
|
|
@ -891,6 +895,7 @@ saved_CFLAGS="$CFLAGS"
|
|||
AM_PATH_XML(2.3.0, enable_libxml=yes, enable_libxml=no)
|
||||
if test $enable_libxml = yes; then
|
||||
CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
|
||||
INCLUDE_FLAGS="$INCLUDE_FLAGS $XML_CFLAGS"
|
||||
LIBS="$LIBS $XML_LIBS"
|
||||
HAVE_LIBXML=1
|
||||
AC_DEFINE(HAVE_LIBXML,1,
|
||||
|
|
@ -919,6 +924,7 @@ libs_temp=$LIBS
|
|||
|
||||
if test "$gmp_incdir" != "no"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$gmp_incdir"
|
||||
INCLUDE_FLAGS="$INCLUDE_FLAGS -I$gmp_incdir"
|
||||
fi
|
||||
if test "$gmp_libdir" != "no"; then
|
||||
LIBS="$LIBS -L$gmp_libdir"
|
||||
|
|
@ -958,6 +964,7 @@ if test $ac_cv_func_iconv = no; then
|
|||
|
||||
if test "$libiconv_libdir" != "no"; then
|
||||
CPPFLAGS="$CPPFLAGS -L$libiconv_libdir"
|
||||
INCLUDE_FLAGS="$INCLUDE_FLAGS -L$libiconv_libdir"
|
||||
fi
|
||||
|
||||
# BSDs install this lib as libgiconv
|
||||
|
|
@ -974,7 +981,7 @@ if test $ac_cv_func_iconv = no; then
|
|||
CPPFLAGS="$cppflags_temp"
|
||||
fi
|
||||
|
||||
AC_SUBST(SYSTEM_DEFS)
|
||||
AC_SUBST(INCLUDE_FLAGS)
|
||||
|
||||
AC_CONFIG_SUBDIRS(Source/mframe SSL)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue