gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-31 17:31:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Guess GNUSTEP_MAKEFILES if not set

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24723 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-28 07:18:52 +00:00
parent de05f167ad
commit 8c5cd78de1
4 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-02-28 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac: Use gnustep-config to set GNUSTEP_MAKEFILES
if not set.
* GNUmakefile: Same change.
* configure: Regenerated.
2007-02-28 Nicola Pero <nicola.pero@meta-innovation.com> 2007-02-28 Nicola Pero <nicola.pero@meta-innovation.com>
* Tools/win32pbs.m (WINVER): Define to make it compile with new * Tools/win32pbs.m (WINVER): Define to make it compile with new

8
GNUmakefile
View file

@ -22,6 +22,14 @@
# If not, write to the Free Software Foundation, # If not, write to the Free Software Foundation,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 # Install into the system root by default
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_INSTALLATION_DOMAIN = SYSTEM

5
configure vendored
View file

@ -1315,6 +1315,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h" ac_config_headers="$ac_config_headers config.h"
# If GNUSTEP_MAKEFILES is undefined, try to use gnustep-config to determine it.
if test -z "$GNUSTEP_MAKEFILES"; then
GNUSTEP_MAKEFILES=`gnustep-config --variable=GNUSTEP_MAKEFILES 2>&5`
fi
if test -z "$GNUSTEP_MAKEFILES"; then if test -z "$GNUSTEP_MAKEFILES"; then
{ { echo "$as_me:$LINENO: 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!" >&5 { { echo "$as_me:$LINENO: 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!" >&5
echo "$as_me: 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!" >&2;} echo "$as_me: 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!" >&2;}

5
configure.ac
View file

@ -30,6 +30,11 @@ AC_PREREQ(2.57)
AC_CONFIG_SRCDIR([back.make.in]) AC_CONFIG_SRCDIR([back.make.in])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
# If GNUSTEP_MAKEFILES is undefined, try to use gnustep-config to determine it.
if test -z "$GNUSTEP_MAKEFILES"; then
GNUSTEP_MAKEFILES=`gnustep-config --variable=GNUSTEP_MAKEFILES 2>&5`
fi
if test -z "$GNUSTEP_MAKEFILES"; then 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!]) 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!])
fi fi