rice 1.2.0 → 1.3.0
Sign up to get free protection for your applications and to get access to all the features.
- data/Doxyfile +1 -1
- data/Makefile.in +130 -52
- data/README +45 -79
- data/Rakefile +1 -36
- data/aclocal.m4 +133 -61
- data/config.guess +43 -8
- data/config.sub +41 -13
- data/configure +1370 -1898
- data/configure.ac +2 -2
- data/doxygen.ac +1 -1
- data/extconf.rb +3 -1
- data/rice/Arg_impl.hpp +2 -2
- data/rice/Data_Type.cpp +34 -1
- data/rice/Data_Type.ipp +14 -5
- data/rice/Data_Type_defn.hpp +28 -1
- data/rice/Director.cpp +0 -6
- data/rice/Director.hpp +0 -8
- data/rice/Hash.hpp +1 -1
- data/rice/Makefile.am +2 -12
- data/rice/Makefile.in +111 -88
- data/rice/Object.cpp +8 -1
- data/rice/Object.ipp +1 -1
- data/rice/Object_defn.hpp +8 -0
- data/rice/config.hpp +3 -0
- data/rice/config.hpp.in +3 -0
- data/rice/detail/Auto_Function_Wrapper.ipp +1025 -512
- data/rice/detail/Auto_Member_Function_Wrapper.ipp +545 -272
- data/rice/detail/cfp.hpp +24 -0
- data/rice/detail/cfp.ipp +51 -0
- data/rice/detail/method_data.cpp +107 -336
- data/rice/detail/node.hpp +13 -13
- data/rice/detail/ruby.hpp +4 -0
- data/rice/detail/rubysig.hpp +19 -19
- data/rice/detail/traits.hpp +43 -0
- data/rice/generate_code.rb +37 -16
- data/rice/protect.hpp +1 -1
- data/rice/protect.ipp +448 -192
- data/rice/to_from_ruby.ipp +4 -12
- data/rice/to_from_ruby_defn.hpp +2 -2
- data/ruby/Makefile.in +99 -32
- data/ruby/lib/Makefile.in +61 -21
- data/ruby/lib/mkmf-rice.rb.in +9 -2
- data/ruby/lib/version.rb +1 -1
- data/sample/Makefile.in +33 -10
- data/test/Makefile.am +27 -0
- data/test/Makefile.in +270 -59
- data/test/ext/Makefile.am +43 -0
- data/test/ext/Makefile.in +399 -0
- data/test/ext/t1/Foo.hpp +10 -0
- data/test/ext/t1/extconf.rb +2 -0
- data/test/ext/t1/t1.cpp +15 -0
- data/test/ext/t2/extconf.rb +2 -0
- data/test/ext/t2/t2.cpp +11 -0
- data/test/test_Allocation_Strategies.cpp +1 -1
- data/test/test_Class.cpp +79 -0
- data/test/test_Data_Type.cpp +2 -2
- data/test/test_Director.cpp +114 -38
- data/test/test_Module.cpp +27 -2
- data/test/test_To_From_Ruby.cpp +4 -4
- data/test/test_rice.rb +9 -1
- metadata +23 -8
- data/rice/detail/method_data.cpp.rpp +0 -301
- data/rice/detail/mininode.cpp.rpp +0 -62
- data/rice/detail/mininode.hpp.rpp +0 -119
- data/rice/detail/remove_const.hpp +0 -21
data/Rakefile
CHANGED
@@ -9,17 +9,8 @@ PROJECT_WEB_PATH = "/var/www/gforge-projects/rice"
|
|
9
9
|
|
10
10
|
task :default => :test
|
11
11
|
|
12
|
-
desc "Build Rice locally. Delete the top level Makefile to force this to run"
|
13
|
-
task :build do
|
14
|
-
if !File.exist?("Makefile")
|
15
|
-
sh "bootstrap"
|
16
|
-
sh "configure"
|
17
|
-
sh "make"
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
12
|
desc "Run unit tests"
|
22
|
-
task :test
|
13
|
+
task :test do
|
23
14
|
cd "test" do
|
24
15
|
ruby "test_rice.rb"
|
25
16
|
end
|
@@ -44,29 +35,3 @@ Rake::GemPackageTask.new($spec) do |pkg|
|
|
44
35
|
pkg.need_zip = true
|
45
36
|
pkg.need_tar = true
|
46
37
|
end
|
47
|
-
|
48
|
-
desc "Create a new release to Rubyforge"
|
49
|
-
task :release => :package do
|
50
|
-
rf = RubyForge.new
|
51
|
-
puts "Logging into rubyforge"
|
52
|
-
rf.login
|
53
|
-
|
54
|
-
pkg = "pkg/#{PROJECT_NAME}-#{Rice::VERSION}"
|
55
|
-
|
56
|
-
c = rf.userconfig
|
57
|
-
|
58
|
-
files = [
|
59
|
-
"#{pkg}.tgz",
|
60
|
-
"#{pkg}.zip",
|
61
|
-
"#{pkg}.gem"
|
62
|
-
]
|
63
|
-
|
64
|
-
puts "Releasing #{PROJECT_NAME} v. #{Rice::VERSION}"
|
65
|
-
begin
|
66
|
-
rf.add_release $spec.rubyforge_project, PROJECT_NAME, RICE_VERSION, *files
|
67
|
-
rescue => ex
|
68
|
-
puts "You may not be configured with rubyforge. Please run `rubyforge config` and run this task again."
|
69
|
-
puts "Error is #{ex.inspect}"
|
70
|
-
end
|
71
|
-
end
|
72
|
-
|
data/aclocal.m4
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
# generated automatically by aclocal 1.
|
1
|
+
# generated automatically by aclocal 1.11 -*- Autoconf -*-
|
2
2
|
|
3
3
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
4
|
-
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
4
|
+
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
5
5
|
# This file is free software; the Free Software Foundation
|
6
6
|
# gives unlimited permission to copy and/or distribute it,
|
7
7
|
# with or without modifications, as long as this notice is preserved.
|
@@ -13,8 +13,8 @@
|
|
13
13
|
|
14
14
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
15
15
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
16
|
-
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.
|
17
|
-
[m4_warning([this file was generated for autoconf 2.
|
16
|
+
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
|
17
|
+
[m4_warning([this file was generated for autoconf 2.64.
|
18
18
|
You have another version of autoconf. It may work, but is not guaranteed to.
|
19
19
|
If you have problems, you may need to regenerate the build system entirely.
|
20
20
|
To do so, use the procedure documented by the package, typically `autoreconf'.])])
|
@@ -31,10 +31,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
|
|
31
31
|
# generated from the m4 files accompanying Automake X.Y.
|
32
32
|
# (This private macro should not be called outside this file.)
|
33
33
|
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
34
|
-
[am__api_version='1.
|
34
|
+
[am__api_version='1.11'
|
35
35
|
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
36
36
|
dnl require some minimum version. Point them to the right macro.
|
37
|
-
m4_if([$1], [1.
|
37
|
+
m4_if([$1], [1.11], [],
|
38
38
|
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
39
39
|
])
|
40
40
|
|
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
|
50
50
|
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
51
51
|
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
52
52
|
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
53
|
-
[AM_AUTOMAKE_VERSION([1.
|
53
|
+
[AM_AUTOMAKE_VERSION([1.11])dnl
|
54
54
|
m4_ifndef([AC_AUTOCONF_VERSION],
|
55
55
|
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
56
56
|
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
@@ -110,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
|
|
110
110
|
|
111
111
|
# AM_CONDITIONAL -*- Autoconf -*-
|
112
112
|
|
113
|
-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
|
113
|
+
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
|
114
114
|
# Free Software Foundation, Inc.
|
115
115
|
#
|
116
116
|
# This file is free software; the Free Software Foundation
|
117
117
|
# gives unlimited permission to copy and/or distribute it,
|
118
118
|
# with or without modifications, as long as this notice is preserved.
|
119
119
|
|
120
|
-
# serial
|
120
|
+
# serial 9
|
121
121
|
|
122
122
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
123
123
|
# -------------------------------------
|
@@ -130,6 +130,7 @@ AC_SUBST([$1_TRUE])dnl
|
|
130
130
|
AC_SUBST([$1_FALSE])dnl
|
131
131
|
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
|
132
132
|
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
|
133
|
+
m4_define([_AM_COND_VALUE_$1], [$2])dnl
|
133
134
|
if $2; then
|
134
135
|
$1_TRUE=
|
135
136
|
$1_FALSE='#'
|
@@ -143,14 +144,14 @@ AC_CONFIG_COMMANDS_PRE(
|
|
143
144
|
Usually this means the macro was only invoked conditionally.]])
|
144
145
|
fi])])
|
145
146
|
|
146
|
-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
147
|
+
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
|
147
148
|
# Free Software Foundation, Inc.
|
148
149
|
#
|
149
150
|
# This file is free software; the Free Software Foundation
|
150
151
|
# gives unlimited permission to copy and/or distribute it,
|
151
152
|
# with or without modifications, as long as this notice is preserved.
|
152
153
|
|
153
|
-
# serial
|
154
|
+
# serial 10
|
154
155
|
|
155
156
|
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
156
157
|
# written in clear, in which case automake, when reading aclocal.m4,
|
@@ -207,6 +208,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
207
208
|
if test "$am_compiler_list" = ""; then
|
208
209
|
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
|
209
210
|
fi
|
211
|
+
am__universal=false
|
212
|
+
m4_case([$1], [CC],
|
213
|
+
[case " $depcc " in #(
|
214
|
+
*\ -arch\ *\ -arch\ *) am__universal=true ;;
|
215
|
+
esac],
|
216
|
+
[CXX],
|
217
|
+
[case " $depcc " in #(
|
218
|
+
*\ -arch\ *\ -arch\ *) am__universal=true ;;
|
219
|
+
esac])
|
220
|
+
|
210
221
|
for depmode in $am_compiler_list; do
|
211
222
|
# Setup a source with many dependencies, because some compilers
|
212
223
|
# like to wrap large dependency lists on column 80 (with \), and
|
@@ -224,7 +235,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
224
235
|
done
|
225
236
|
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
226
237
|
|
238
|
+
# We check with `-c' and `-o' for the sake of the "dashmstdout"
|
239
|
+
# mode. It turns out that the SunPro C++ compiler does not properly
|
240
|
+
# handle `-M -o', and we need to detect this. Also, some Intel
|
241
|
+
# versions had trouble with output in subdirs
|
242
|
+
am__obj=sub/conftest.${OBJEXT-o}
|
243
|
+
am__minus_obj="-o $am__obj"
|
227
244
|
case $depmode in
|
245
|
+
gcc)
|
246
|
+
# This depmode causes a compiler race in universal mode.
|
247
|
+
test "$am__universal" = false || continue
|
248
|
+
;;
|
228
249
|
nosideeffect)
|
229
250
|
# after this tag, mechanisms are not by side-effect, so they'll
|
230
251
|
# only be used when explicitly requested
|
@@ -234,19 +255,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
|
|
234
255
|
break
|
235
256
|
fi
|
236
257
|
;;
|
258
|
+
msvisualcpp | msvcmsys)
|
259
|
+
# This compiler won't grok `-c -o', but also, the minuso test has
|
260
|
+
# not run yet. These depmodes are late enough in the game, and
|
261
|
+
# so weak that their functioning should not be impacted.
|
262
|
+
am__obj=conftest.${OBJEXT-o}
|
263
|
+
am__minus_obj=
|
264
|
+
;;
|
237
265
|
none) break ;;
|
238
266
|
esac
|
239
|
-
# We check with `-c' and `-o' for the sake of the "dashmstdout"
|
240
|
-
# mode. It turns out that the SunPro C++ compiler does not properly
|
241
|
-
# handle `-M -o', and we need to detect this.
|
242
267
|
if depmode=$depmode \
|
243
|
-
source=sub/conftest.c object
|
268
|
+
source=sub/conftest.c object=$am__obj \
|
244
269
|
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
245
|
-
$SHELL ./depcomp $depcc -c
|
270
|
+
$SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
|
246
271
|
>/dev/null 2>conftest.err &&
|
247
272
|
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
|
248
273
|
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
249
|
-
grep
|
274
|
+
grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
|
250
275
|
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
251
276
|
# icc doesn't choke on unknown options, it will just issue warnings
|
252
277
|
# or remarks (even with -Werror). So we grep stderr for any message
|
@@ -396,13 +421,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
396
421
|
# Do all the work for Automake. -*- Autoconf -*-
|
397
422
|
|
398
423
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
399
|
-
# 2005, 2006, 2008 Free Software Foundation, Inc.
|
424
|
+
# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
|
400
425
|
#
|
401
426
|
# This file is free software; the Free Software Foundation
|
402
427
|
# gives unlimited permission to copy and/or distribute it,
|
403
428
|
# with or without modifications, as long as this notice is preserved.
|
404
429
|
|
405
|
-
# serial
|
430
|
+
# serial 16
|
406
431
|
|
407
432
|
# This macro actually does too much. Some checks are only needed if
|
408
433
|
# your package does certain things. But this isn't really a big deal.
|
@@ -419,7 +444,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
|
419
444
|
# arguments mandatory, and then we can depend on a new Autoconf
|
420
445
|
# release and drop the old call support.
|
421
446
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
422
|
-
[AC_PREREQ([2.
|
447
|
+
[AC_PREREQ([2.62])dnl
|
423
448
|
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
424
449
|
dnl the ones we care about.
|
425
450
|
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
@@ -470,8 +495,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
|
|
470
495
|
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
|
471
496
|
AM_MISSING_PROG(AUTOHEADER, autoheader)
|
472
497
|
AM_MISSING_PROG(MAKEINFO, makeinfo)
|
473
|
-
AM_PROG_INSTALL_SH
|
474
|
-
AM_PROG_INSTALL_STRIP
|
498
|
+
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
499
|
+
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
|
475
500
|
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
|
476
501
|
# We need awk for the "check" target. The system "awk" is bad on
|
477
502
|
# some platforms.
|
@@ -479,24 +504,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
|
|
479
504
|
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
480
505
|
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
481
506
|
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
|
482
|
-
|
483
|
-
|
507
|
+
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
508
|
+
[_AM_PROG_TAR([v7])])])
|
484
509
|
_AM_IF_OPTION([no-dependencies],,
|
485
510
|
[AC_PROVIDE_IFELSE([AC_PROG_CC],
|
486
|
-
|
487
|
-
|
488
|
-
|
511
|
+
[_AM_DEPENDENCIES(CC)],
|
512
|
+
[define([AC_PROG_CC],
|
513
|
+
defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
489
514
|
AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
490
|
-
|
491
|
-
|
492
|
-
|
515
|
+
[_AM_DEPENDENCIES(CXX)],
|
516
|
+
[define([AC_PROG_CXX],
|
517
|
+
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
493
518
|
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
|
494
|
-
|
495
|
-
|
496
|
-
|
519
|
+
[_AM_DEPENDENCIES(OBJC)],
|
520
|
+
[define([AC_PROG_OBJC],
|
521
|
+
defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
|
497
522
|
])
|
523
|
+
_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
|
524
|
+
dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
|
525
|
+
dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
|
526
|
+
dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
|
527
|
+
AC_CONFIG_COMMANDS_PRE(dnl
|
528
|
+
[m4_provide_if([_AM_COMPILER_EXEEXT],
|
529
|
+
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
|
498
530
|
])
|
499
531
|
|
532
|
+
dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
|
533
|
+
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
|
534
|
+
dnl mangled by Autoconf and run in a shell conditional statement.
|
535
|
+
m4_define([_AC_COMPILER_EXEEXT],
|
536
|
+
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
|
537
|
+
|
500
538
|
|
501
539
|
# When config.status generates a header, we must update the stamp-h file.
|
502
540
|
# This file resides in the same directory as the config header
|
@@ -519,7 +557,7 @@ for _am_header in $config_headers :; do
|
|
519
557
|
done
|
520
558
|
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
521
559
|
|
522
|
-
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
560
|
+
# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
|
523
561
|
#
|
524
562
|
# This file is free software; the Free Software Foundation
|
525
563
|
# gives unlimited permission to copy and/or distribute it,
|
@@ -530,7 +568,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
|
|
530
568
|
# Define $install_sh.
|
531
569
|
AC_DEFUN([AM_PROG_INSTALL_SH],
|
532
570
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
533
|
-
|
571
|
+
if test x"${install_sh}" != xset; then
|
572
|
+
case $am_aux_dir in
|
573
|
+
*\ * | *\ *)
|
574
|
+
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
575
|
+
*)
|
576
|
+
install_sh="\${SHELL} $am_aux_dir/install-sh"
|
577
|
+
esac
|
578
|
+
fi
|
534
579
|
AC_SUBST(install_sh)])
|
535
580
|
|
536
581
|
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
@@ -556,13 +601,13 @@ AC_SUBST([am__leading_dot])])
|
|
556
601
|
|
557
602
|
# Check to see how 'make' treats includes. -*- Autoconf -*-
|
558
603
|
|
559
|
-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
|
604
|
+
# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
|
560
605
|
#
|
561
606
|
# This file is free software; the Free Software Foundation
|
562
607
|
# gives unlimited permission to copy and/or distribute it,
|
563
608
|
# with or without modifications, as long as this notice is preserved.
|
564
609
|
|
565
|
-
# serial
|
610
|
+
# serial 4
|
566
611
|
|
567
612
|
# AM_MAKE_INCLUDE()
|
568
613
|
# -----------------
|
@@ -571,7 +616,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
|
|
571
616
|
[am_make=${MAKE-make}
|
572
617
|
cat > confinc << 'END'
|
573
618
|
am__doit:
|
574
|
-
@echo
|
619
|
+
@echo this is the am__doit target
|
575
620
|
.PHONY: am__doit
|
576
621
|
END
|
577
622
|
# If we don't find an include directive, just comment out the code.
|
@@ -581,24 +626,24 @@ am__quote=
|
|
581
626
|
_am_result=none
|
582
627
|
# First try GNU make style include.
|
583
628
|
echo "include confinc" > confmf
|
584
|
-
#
|
585
|
-
|
586
|
-
|
587
|
-
|
588
|
-
|
589
|
-
|
590
|
-
|
591
|
-
|
592
|
-
_am_result=GNU
|
593
|
-
fi
|
629
|
+
# Ignore all kinds of additional output from `make'.
|
630
|
+
case `$am_make -s -f confmf 2> /dev/null` in #(
|
631
|
+
*the\ am__doit\ target*)
|
632
|
+
am__include=include
|
633
|
+
am__quote=
|
634
|
+
_am_result=GNU
|
635
|
+
;;
|
636
|
+
esac
|
594
637
|
# Now try BSD make style include.
|
595
638
|
if test "$am__include" = "#"; then
|
596
639
|
echo '.include "confinc"' > confmf
|
597
|
-
|
598
|
-
|
599
|
-
|
600
|
-
|
601
|
-
|
640
|
+
case `$am_make -s -f confmf 2> /dev/null` in #(
|
641
|
+
*the\ am__doit\ target*)
|
642
|
+
am__include=.include
|
643
|
+
am__quote="\""
|
644
|
+
_am_result=BSD
|
645
|
+
;;
|
646
|
+
esac
|
602
647
|
fi
|
603
648
|
AC_SUBST([am__include])
|
604
649
|
AC_SUBST([am__quote])
|
@@ -608,14 +653,14 @@ rm -f confinc confmf
|
|
608
653
|
|
609
654
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
610
655
|
|
611
|
-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
|
656
|
+
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
|
612
657
|
# Free Software Foundation, Inc.
|
613
658
|
#
|
614
659
|
# This file is free software; the Free Software Foundation
|
615
660
|
# gives unlimited permission to copy and/or distribute it,
|
616
661
|
# with or without modifications, as long as this notice is preserved.
|
617
662
|
|
618
|
-
# serial
|
663
|
+
# serial 6
|
619
664
|
|
620
665
|
# AM_MISSING_PROG(NAME, PROGRAM)
|
621
666
|
# ------------------------------
|
@@ -632,7 +677,14 @@ AC_SUBST($1)])
|
|
632
677
|
AC_DEFUN([AM_MISSING_HAS_RUN],
|
633
678
|
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
634
679
|
AC_REQUIRE_AUX_FILE([missing])dnl
|
635
|
-
test x"${MISSING+set}"
|
680
|
+
if test x"${MISSING+set}" != xset; then
|
681
|
+
case $am_aux_dir in
|
682
|
+
*\ * | *\ *)
|
683
|
+
MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
|
684
|
+
*)
|
685
|
+
MISSING="\${SHELL} $am_aux_dir/missing" ;;
|
686
|
+
esac
|
687
|
+
fi
|
636
688
|
# Use eval to expand $SHELL
|
637
689
|
if eval "$MISSING --run true"; then
|
638
690
|
am_missing_run="$MISSING --run "
|
@@ -703,14 +755,14 @@ AC_DEFUN([_AM_IF_OPTION],
|
|
703
755
|
|
704
756
|
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
705
757
|
|
706
|
-
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
758
|
+
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
|
707
759
|
# Free Software Foundation, Inc.
|
708
760
|
#
|
709
761
|
# This file is free software; the Free Software Foundation
|
710
762
|
# gives unlimited permission to copy and/or distribute it,
|
711
763
|
# with or without modifications, as long as this notice is preserved.
|
712
764
|
|
713
|
-
# serial
|
765
|
+
# serial 5
|
714
766
|
|
715
767
|
# AM_SANITY_CHECK
|
716
768
|
# ---------------
|
@@ -719,16 +771,29 @@ AC_DEFUN([AM_SANITY_CHECK],
|
|
719
771
|
# Just in case
|
720
772
|
sleep 1
|
721
773
|
echo timestamp > conftest.file
|
774
|
+
# Reject unsafe characters in $srcdir or the absolute working directory
|
775
|
+
# name. Accept space and tab only in the latter.
|
776
|
+
am_lf='
|
777
|
+
'
|
778
|
+
case `pwd` in
|
779
|
+
*[[\\\"\#\$\&\'\`$am_lf]]*)
|
780
|
+
AC_MSG_ERROR([unsafe absolute working directory name]);;
|
781
|
+
esac
|
782
|
+
case $srcdir in
|
783
|
+
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
|
784
|
+
AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
|
785
|
+
esac
|
786
|
+
|
722
787
|
# Do `set' in a subshell so we don't clobber the current shell's
|
723
788
|
# arguments. Must try -L first in case configure is actually a
|
724
789
|
# symlink; some systems play weird games with the mod time of symlinks
|
725
790
|
# (eg FreeBSD returns the mod time of the symlink's containing
|
726
791
|
# directory).
|
727
792
|
if (
|
728
|
-
set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
793
|
+
set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
|
729
794
|
if test "$[*]" = "X"; then
|
730
795
|
# -L didn't work.
|
731
|
-
set X `ls -t $srcdir/configure conftest.file`
|
796
|
+
set X `ls -t "$srcdir/configure" conftest.file`
|
732
797
|
fi
|
733
798
|
rm -f conftest.file
|
734
799
|
if test "$[*]" != "X $srcdir/configure conftest.file" \
|
@@ -781,18 +846,25 @@ fi
|
|
781
846
|
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
782
847
|
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
783
848
|
|
784
|
-
# Copyright (C) 2006 Free Software Foundation, Inc.
|
849
|
+
# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
|
785
850
|
#
|
786
851
|
# This file is free software; the Free Software Foundation
|
787
852
|
# gives unlimited permission to copy and/or distribute it,
|
788
853
|
# with or without modifications, as long as this notice is preserved.
|
789
854
|
|
855
|
+
# serial 2
|
856
|
+
|
790
857
|
# _AM_SUBST_NOTMAKE(VARIABLE)
|
791
858
|
# ---------------------------
|
792
859
|
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
|
793
860
|
# This macro is traced by Automake.
|
794
861
|
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
795
862
|
|
863
|
+
# AM_SUBST_NOTMAKE(VARIABLE)
|
864
|
+
# ---------------------------
|
865
|
+
# Public sister of _AM_SUBST_NOTMAKE.
|
866
|
+
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
867
|
+
|
796
868
|
# Check how to create a tarball. -*- Autoconf -*-
|
797
869
|
|
798
870
|
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|