[fU-cvs] libfunutil Makefile,1.8,1.9 configure.libfunutil,1.17,1.18 toc_shared.make.at,1.20,1.21

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv13622

Modified Files:
	Makefile configure.libfunutil toc_shared.make.at 
Log Message:
added buildtool-related checks.

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	29 Aug 2003 05:40:12 -0000	1.8
+++ Makefile	31 Aug 2003 00:50:26 -0000	1.9
@@ -32,8 +32,10 @@
 DIST_FILES += configure toc_shared.make.at toc_shared.qmake.at
 DIST_FILES += configure.$(PACKAGE_NAME)
 DIST_FILES += README README.bt README.toc COPYING
+ifeq (1,$(configure_with_buildtool))
 DIST_FILES += Makefile.bt buildtool.d/config buildtool.d/defs buildtool.d/docs
 DIST_FILES += data/libfunUtil.bpf.in data/Makefile.bt
+endif
 
 all: $(TOC_SHARED_MAKEFILE) subdirs
 

Index: configure.libfunutil
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure.libfunutil,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- configure.libfunutil	30 Aug 2003 19:21:11 -0000	1.17
+++ configure.libfunutil	31 Aug 2003 00:50:26 -0000	1.18
@@ -1,10 +1,7 @@
 # package-specific configure script for libfunutil
 
 toc_run_fail toc_tests_help
-
-#  very funny.
-#accept_license_LICENSES="GPL" # enabled bypassing license with --accept-license=GPL
-#toc_run_fail accept_license COPYING || toc_die 42 "You didn't accept the license agreement!"
+toc_run_failok buildtool
 
 toc_add_config PACKAGE_COPYRIGHT="GNU General Public License, version 2. Copyright (c) 2000-2003 Rusty Ballinger (bo...@so...) and stephan beal (sg...@us...)."
 

Index: toc_shared.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.make.at,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- toc_shared.make.at	29 Aug 2003 10:44:02 -0000	1.20
+++ toc_shared.make.at	31 Aug 2003 00:50:26 -0000	1.21
@@ -53,9 +53,17 @@
 pkgincludedir = $(includedir)/@PACKAGE_NAME@
 pkgdocsdir = $(datadir)/doc/@PACKAGE_NAME@
 
-
 toc_makesdir = $(toc_tocdir)/make
 
+
+# enable/disable 'buildtool'. This is here because i can't do
+# a make dist because some BT-related files are missing. ;)
+configure_with_buildtool = @configure_with_buildtool@
+ifeq (1,$(configure_with_buildtool))
+BUILDTOOL_BIN = @BUILDTOOL_BIN@
+else
+BUILDTOOL_BIN =
+endif
 
 
 CC = @CC@