mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Updated configure and makefiles in the case when GNUSTEP_MAKEFILES is not set
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24660 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola
parent
0365aef78c
commit
11e4f42b7c
13 changed files with 6597 additions and 6788 deletions
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2007-02-19 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac: Updated gnustep-config calls for new/final syntax.
|
||||
Do not source GNUstep.sh at the beginning.
|
||||
* configure: Regenerated.
|
||||
* GNUmakefile: Updated gnustep-config calls, plus set
|
||||
GNUSTEP_MAKEFILES properly using :=, not =.
|
||||
* Documentation/GNUmakefile: Same changes.
|
||||
* Examples/GNUmakefile: Same changes.
|
||||
* NSTimeZones/GNUmakefile: Same changes.
|
||||
* NSTimeZones/GNUmakefile: Same changes.
|
||||
* Resources/GNUmakefile: Same changes.
|
||||
* Source/GNUmakefile: Same changes.
|
||||
* SSL/GNUmakefile: Same changes.
|
||||
* Testing/GNUmakefile: Same changes.
|
||||
* Tools/GNUmakefile: Same changes.
|
||||
|
||||
2007-02-19 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSRunLoop.m: ([performSelector:target:argument:order:modes:])
|
||||
|
|
|
|||
|
|
@ -21,19 +21,19 @@
|
|||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
# Install into the system root by default
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
|
|
@ -23,16 +23,16 @@
|
|||
# Boston, MA 02111 USA.
|
||||
#
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../base.make
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../base.make
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
# The tools to be created
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@
|
|||
# Boston, MA 02111 USA
|
||||
#
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -21,19 +21,19 @@
|
|||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
# Install into the system root by default
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
CHARSET_FILES = \
|
||||
|
|
|
|||
|
|
@ -21,19 +21,19 @@
|
|||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
# Install into the system root by default
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
|
|
@ -22,18 +22,18 @@
|
|||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
RESOURCE_SET_NAME = base-resources
|
||||
|
|
|
|||
|
|
@ -23,6 +23,14 @@
|
|||
# Boston, MA 02111 USA.
|
||||
#
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
# Install into the system root by default
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
|
|
@ -30,14 +38,6 @@ GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
|||
# Additional makefiles.
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
-include ../config.mak
|
||||
|
|
|
|||
|
|
@ -23,19 +23,19 @@
|
|||
# Boston, MA 02111 USA.
|
||||
#
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
# Install into the system root by default
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
|
|
@ -22,16 +22,16 @@
|
|||
# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02111, USA.
|
||||
#
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)$(warning computed GNUSTEP_MAKEFILES)
|
||||
endif
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
|
|
@ -21,19 +21,19 @@
|
|||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02111 USA.
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
endif
|
||||
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
# Install into the system root by default
|
||||
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
|
||||
|
||||
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
|
||||
|
||||
GNUSTEP_MAKEFILES?=$(shell gnustep-config GNUSTEP_MAKEFILES 2>/dev/null)
|
||||
|
||||
# This usually happens when you source GNUstep.sh, then run ./configure,
|
||||
# then log out, then log in again and try to compile
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
|
||||
endif
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/common.make
|
||||
|
||||
include ../Version
|
||||
|
|
|
|||
11
configure.ac
11
configure.ac
|
|
@ -33,17 +33,20 @@ builtin(include, config/addlibrarypath.m4)dnl
|
|||
AC_INIT
|
||||
AC_CONFIG_SRCDIR([Source/NSArray.m])
|
||||
|
||||
# Where GNUSTEP_MAKEFILES is undefined, use gnustep-config if it is available.
|
||||
# If GNUSTEP_MAKEFILES is undefined, try to use gnustep-config to determine it.
|
||||
if test -z "$GNUSTEP_MAKEFILES"; then
|
||||
GNUSTEP_MAKEFILES=`gnustep-config GNUSTEP_MAKEFILES 2>&5`
|
||||
GNUSTEP_MAKEFILES=`gnustep-config --variable=GNUSTEP_MAKEFILES 2>&5`
|
||||
fi
|
||||
|
||||
if test -z "$GNUSTEP_MAKEFILES"; then
|
||||
AC_MSG_ERROR([You must have the gnustep-make package installed and set up the GNUSTEP_MAKEFILES environment variable to contain the path to the makefiles directory before configuring!])
|
||||
else
|
||||
. $GNUSTEP_MAKEFILES/GNUstep.sh
|
||||
fi
|
||||
|
||||
# We shouldn't be loading GNUstep.sh here. It would load in a lot of
|
||||
# variables which might get confused with the ones that will be used
|
||||
# at runtime. We will load it later once we have determined (and
|
||||
# saved) the runtime configuration.
|
||||
|
||||
# This variable might get temporarily overwritten with the
|
||||
# GNUSTEP_MAKEFILES of the runtime configuration, make sure we keep
|
||||
# track of the original one. CURRENT_GNUSTEP_MAKEFILES is the one
|
||||
|
|
|
|||
Loading…
Reference in a new issue