rpms/gnu-smalltalk/devel gst-3.0.2-am.patch, NONE, 1.1 gnu-smalltalk.spec, 1.36, 1.37

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16858

Modified Files:
	gnu-smalltalk.spec 
Added Files:
	gst-3.0.2-am.patch 
Log Message:
Add forgotten file

gst-3.0.2-am.patch:

--- NEW FILE gst-3.0.2-am.patch ---
diff -up smalltalk-3.0.2/configure.ac.auto smalltalk-3.0.2/configure.ac
--- smalltalk-3.0.2/configure.ac.auto	2008-03-07 11:53:43.000000000 +0100
+++ smalltalk-3.0.2/configure.ac	2008-03-13 19:22:40.000000000 +0100
@@ -7,7 +7,7 @@ dnl with this software.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT([GNU Smalltalk], 3.0.2, help-smalltalk at gnu.org, smalltalk)
+AC_INIT([GNU Smalltalk], 3.0.2, help-smalltalk at gnu.org, gnu-smalltalk)
 MAINTAINER="bonzini at gnu.org"
 
 dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
@@ -72,7 +72,21 @@ AM_MISSING_PROG(AUTOM4TE, autom4te, $mis
 dnl 
 dnl ------------------------------ SUBDIRS --------------------
 
-AC_CONFIG_SUBDIRS(libffi)
+AC_ARG_WITH(system-libffi,
+[  --with-system-libffi[=PATH]   use system libffi.la (search in PATH if given)],
+[], [with_system_libffi=no])
+
+if test $with_system_libffi = no; then
+  AC_CONFIG_SUBDIRS(libffi)
+  INCFFI='-I$(top_srcdir)/libffi/include -I$(top_builddir)/libffi/include'
+  LIBFFI='$(top_builddir)/libffi/libffi.la'
+elif test $with_system_libffi = yes; then
+  INCFFI= LIBFFI=-lffi
+else
+  INCFFI="-I$withval/include" LIBFFI="-L$withval -lffi"
+fi
+AC_SUBST(INCFFI)
+AC_SUBST(LIBFFI)
 
 case $ac_configure_args in
   *--enable-subdir) ;;
@@ -87,12 +101,27 @@ AC_ARG_ENABLE(generational-gc,
         *-*-cygwin* | *-*-mingw* | ia64-*-* ) enable_generational_gc=no ;;
         *) enable_generational_gc=yes ;;
 esac])
-if test $enable_generational_gc != no; then
-  AC_CONFIG_SUBDIRS(sigsegv)
-  AC_DEFINE(HAVE_SIGSEGV_H, 1,
-    [Define to 1 if libsigsegv is being used])
+
+AC_ARG_WITH(system-libsigsegv,
+[  --with-system-libsigsegv[=PATH]   use system libsigsegv.la likewise],
+[], [with_system_libsigsegv=no])
+
+if test $enable_generational_gc = no; then
+  INCSIGSEGV= LIBSIGSEGV=
+else
+  AC_DEFINE(HAVE_SIGSEGV_H, 1, [Define to 1 if libsigsegv is being used])
+  if test $with_system_libsigsegv = no; then
+    AC_CONFIG_SUBDIRS(sigsegv)
+    INCSIGSEGV='-I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src'
+    LIBSIGSEGV='$(top_builddir)/sigsegv/src/libsigsegv.la'
+  elif test $with_system_libsigsegv = yes; then
+    INCSIGSEGV= LIBSIGSEGV=-lsigsegv
+  else
+    INCSIGSEGV="-I$withval/../include" LIBSIGSEGV="-L$withval -lsigsegv"
+  fi
 fi
-AM_CONDITIONAL(HAVE_SIGSEGV, test "$enable_generational_gc" != no)
+AC_SUBST(INCSIGSEGV)
+AC_SUBST(LIBSIGSEGV)
 
 AC_ARG_WITH(imagedir,
 [  --with-imagedir=PATH   path where to place the system image
diff -up smalltalk-3.0.2/libgst/Makefile.am.auto smalltalk-3.0.2/libgst/Makefile.am
--- smalltalk-3.0.2/libgst/Makefile.am.auto	2008-03-07 11:53:44.000000000 +0100
+++ smalltalk-3.0.2/libgst/Makefile.am	2008-03-13 19:13:27.000000000 +0100
@@ -7,19 +7,14 @@ AM_YFLAGS = -vy
 AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \
   -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
   -DLIBEXEC_PATH=\"$(libexecdir)/$(PACKAGE)\" \
-  -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
-  -I$(top_builddir)/libffi/include $(INCLIGHTNING) \
-  @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
+  -I$(top_srcdir)/lib-src $(INCFFI) $(INCLIGHTNING) \
+  $(INCSNPRINTFV) $(INCSIGSEGV) -I$(top_builddir)/lib-src
 
 if !HAVE_INSTALLED_LIGHTNING
 AM_CPPFLAGS += -I$(top_srcdir)/lightning -I$(top_builddir)/lightning \
   -I$(top_srcdir) -I$(top_builddir)
 endif
 
-if HAVE_SIGSEGV
-AM_CPPFLAGS += -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
-endif
-
 include_HEADERS = gstpub.h gst.h
 lib_LTLIBRARIES = libgst.la
 EXTRA_PROGRAMS = genprims genbc genvm
@@ -28,15 +23,9 @@ CLEANFILES = genprims$(EXEEXT) genbc$(EX
 # definitions for libgst.la
 
 libgst_la_LIBADD=$(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
+	$(LIBSIGSEGV) $(LIBFFI) $(LIBSNPRINTFV) $(LIBREADLINE) $(LIBGMP)
 
-libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
-
-if HAVE_SIGSEGV
-libgst_la_LIBADD += $(top_builddir)/sigsegv/src/libsigsegv.la
-libgst_la_DEPENDENCIES += $(top_builddir)/sigsegv/src/libsigsegv.la
-endif
+libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la @LIBSNPRINTFV@
 
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
 	-export-symbols-regex "^gst_.*"


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnu-smalltalk.spec	9 Apr 2008 14:03:35 -0000	1.36
+++ gnu-smalltalk.spec	9 Apr 2008 14:14:10 -0000	1.37
@@ -3,7 +3,7 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 3.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Patch1: gst-3.0.2-am.patch
 Patch2: gst-3.0-tst117.patch
@@ -179,7 +179,7 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
-* Sat Mar 08 2008 Xavier Lamien <lxtnow[at]gmail.com> 3.0.2-1
+* Sat Mar 08 2008 Xavier Lamien <lxtnow[at]gmail.com> 3.0.2-2
 - Updated release.
 - Disable x86_64 arch, because 'make test' fails on this arch