git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.in (LIBOBJC_VERSION, [...]): Use definition from configure.in. 

2004-03-15  Manfred Hollstein  <mh@suse.com>

	* Makefile.in (LIBOBJC_VERSION, LIBOBJC_GC_VERSION): Use
	definition from configure.in.
	* configure.in (PACKAGE): Add definition.
	(VERSION): Add definition; substitute it in output files.
	* configure: Re-generate.

From-SVN: r79508
This commit is contained in:
Manfred Hollstein 2004-03-15 18:52:38 +00:00 committed by Manfred Hollstein
parent 1f8551b263
commit 68a1af8795
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libobjc/ChangeLog
View File

@ -1,3 +1,11 @@
2004-03-15 Manfred Hollstein <mh@suse.com>
* Makefile.in (LIBOBJC_VERSION, LIBOBJC_GC_VERSION): Use
definition from configure.in.
* configure.in (PACKAGE): Add definition.
(VERSION): Add definition; substitute it in output files.
* configure: Re-generate.
2004-03-05 Ziemowit Laski <zlaski@apple.com> 2004-03-05 Ziemowit Laski <zlaski@apple.com>
* objc/hash.h (hash_string, compare_strings): * objc/hash.h (hash_string, compare_strings):

4
libobjc/Makefile.in
View File

@ -78,8 +78,8 @@ ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(WARN_CFLAGS) \
# begin compiled and compatibility issues. # begin compiled and compatibility issues.
# Please refer to Libtool documentation about how to manage these # Please refer to Libtool documentation about how to manage these
# numbers. # numbers.
LIBOBJC_VERSION = 1:0:0 LIBOBJC_VERSION = @VERSION@
LIBOBJC_GC_VERSION = 1:0:0 LIBOBJC_GC_VERSION = @VERSION@
# @LIBTOOL@ does not get it right, so we hack it in - FIXME # @LIBTOOL@ does not get it right, so we hack it in - FIXME
LIBTOOL = ./libtool LIBTOOL = ./libtool
LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile

5
libobjc/configure vendored
View File

@ -2635,6 +2635,10 @@ else
fi fi
PACKAGE=libobjc
VERSION=1:0:0
# Sanity check for the cross-compilation case: # Sanity check for the cross-compilation case:
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:2641: checking how to run the C preprocessor" >&5 echo "configure:2641: checking how to run the C preprocessor" >&5
@ -3107,6 +3111,7 @@ s%@DLLTOOL@%$DLLTOOL%g
s%@OBJDUMP@%$OBJDUMP%g s%@OBJDUMP@%$OBJDUMP%g
s%@LIBTOOL@%$LIBTOOL%g s%@LIBTOOL@%$LIBTOOL%g
s%@SET_MAKE@%$SET_MAKE%g s%@SET_MAKE@%$SET_MAKE%g
s%@VERSION@%$VERSION%g
s%@CPP@%$CPP%g s%@CPP@%$CPP%g
s%@GTHREAD_FLAGS@%$GTHREAD_FLAGS%g s%@GTHREAD_FLAGS@%$GTHREAD_FLAGS%g
s%@OBJC_BOEHM_GC@%$OBJC_BOEHM_GC%g s%@OBJC_BOEHM_GC@%$OBJC_BOEHM_GC%g

6
libobjc/configure.in
View File

@ -60,6 +60,12 @@ fi
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
dnl we need the following definitions because AC_PROG_LIBTOOL relies on them
PACKAGE=libobjc
dnl version is pulled out to make it a bit easier to change using sed.
VERSION=1:0:0
AC_SUBST(VERSION)
dnl Checks for header files. dnl Checks for header files.
# Sanity check for the cross-compilation case: # Sanity check for the cross-compilation case:
AC_CHECK_HEADER(stdio.h,:, AC_CHECK_HEADER(stdio.h,:,