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

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 37300f06e95c115a38eab0243aed64a85a0638c1..a7ad5312280f9d409346be26fda062bcec985a00 100644 (file)
--- 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 ad91e72b30a711b9ab127390f8a8a49ce3648468..c929477e562070e6669088f68787e96025631c2f 100644 (file)
--- 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 f2f013ad371a5a2739329b8c42de1e7e836b7535..8f9b8a34457506f8b964ea91f96e696230db6d26 100755 (executable)
--- 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 b20671faadff98dad8dff1663b20e079b6cafc2f..62c8ef11b5228a4bf457ee8b19280503fffd74e6 100644 (file)
--- 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,:,