diff options
| author | Manfred Hollstein <mh@suse.com> | 2004-03-15 18:52:38 +0000 |
|---|---|---|
| committer | Manfred Hollstein <manfred@gcc.gnu.org> | 2004-03-15 18:52:38 +0000 |
| commit | 68a1af8795e896c86b0ff44662e6dc47e8b119ae (patch) | |
| tree | 08636de38be4364f2c8689184a1adff096a57c22 | |
| parent | 1f8551b2637b9091bf9526dbaac0775f7ea490a5 (diff) | |
| download | gcc-68a1af8795e896c86b0ff44662e6dc47e8b119ae.zip gcc-68a1af8795e896c86b0ff44662e6dc47e8b119ae.tar.gz gcc-68a1af8795e896c86b0ff44662e6dc47e8b119ae.tar.bz2 | |
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
| -rw-r--r-- | libobjc/ChangeLog | 8 | ||||
| -rw-r--r-- | libobjc/Makefile.in | 4 | ||||
| -rwxr-xr-x | libobjc/configure | 5 | ||||
| -rw-r--r-- | libobjc/configure.in | 6 |
4 files changed, 21 insertions, 2 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 37300f0..a7ad531 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -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> * objc/hash.h (hash_string, compare_strings): diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index ad91e72..c929477 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -78,8 +78,8 @@ ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(WARN_CFLAGS) \ # begin compiled and compatibility issues. # Please refer to Libtool documentation about how to manage these # numbers. -LIBOBJC_VERSION = 1:0:0 -LIBOBJC_GC_VERSION = 1:0:0 +LIBOBJC_VERSION = @VERSION@ +LIBOBJC_GC_VERSION = @VERSION@ # @LIBTOOL@ does not get it right, so we hack it in - FIXME LIBTOOL = ./libtool LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile diff --git a/libobjc/configure b/libobjc/configure index f2f013a..8f9b8a3 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -2635,6 +2635,10 @@ else fi +PACKAGE=libobjc +VERSION=1:0:0 + + # Sanity check for the cross-compilation case: 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 @@ -3107,6 +3111,7 @@ s%@DLLTOOL@%$DLLTOOL%g s%@OBJDUMP@%$OBJDUMP%g s%@LIBTOOL@%$LIBTOOL%g s%@SET_MAKE@%$SET_MAKE%g +s%@VERSION@%$VERSION%g s%@CPP@%$CPP%g s%@GTHREAD_FLAGS@%$GTHREAD_FLAGS%g s%@OBJC_BOEHM_GC@%$OBJC_BOEHM_GC%g diff --git a/libobjc/configure.in b/libobjc/configure.in index b20671f..62c8ef1 100644 --- a/libobjc/configure.in +++ b/libobjc/configure.in @@ -60,6 +60,12 @@ fi AC_PROG_INSTALL 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. # Sanity check for the cross-compilation case: AC_CHECK_HEADER(stdio.h,:, |