buildsys  Check-in [5e8c4f49fc]

Overview
Comment:Do not automatically call AC_CONFIG_COMMANDS_*

This causes problems with some versions of autoconf / m4. Moving it to a
function called BUILDSYS_INIT and calling that fixes it.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5e8c4f49fcea23e02a5edf1ee94c6aeeb8e32439ef2d104470c297b1dca81232
User & Date: js on 2014-02-24 02:55:15
Other Links: manifest | tags
Context
2014-05-06
20:35
Fix dependency checking with bmake check-in: bd5f98820f user: js tags: trunk
2014-02-24
02:55
Do not automatically call AC_CONFIG_COMMANDS_* check-in: 5e8c4f49fc user: js tags: trunk
2014-02-23
17:39
Update copyright check-in: a546121a77 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified configure.ac from [41d8651685] to [e1de09361e]. 

1
2
3
4
5
6
7
8
9
10
11

12
13
14
15
16
17
18

dnl
dnl  This is an example configure.ac that demonstrates how to use the buildsys.
dnl  You should not just copy it, but edit it to fit your needs!
dnl
dnl  To generate the configure script, call:
dnl    aclocal -I m4
dnl    autoconf
dnl

dnl Specify name, version and contact e-mail of the package.
AC_INIT(name, version, e-mail)


dnl Specifies where your sources are.
AC_CONFIG_SRCDIR(src)

dnl If your package uses C, you want a C compiler and a C preprocessor
AC_PROG_CC
AC_PROG_CPP












>








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

dnl
dnl  This is an example configure.ac that demonstrates how to use the buildsys.
dnl  You should not just copy it, but edit it to fit your needs!
dnl
dnl  To generate the configure script, call:
dnl    aclocal -I m4
dnl    autoconf
dnl

dnl Specify name, version and contact e-mail of the package.
AC_INIT(name, version, e-mail)
BUILDSYS_INIT

dnl Specifies where your sources are.
AC_CONFIG_SRCDIR(src)

dnl If your package uses C, you want a C compiler and a C preprocessor
AC_PROG_CC
AC_PROG_CPP
︙︙

Modified m4/buildsys.m4 from [e1a4bd56c8] to [3e6f9bdfdf].

︙︙
17
18
19
20
21
22
23

24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53

54

55

56

57
58

59

60

61

62

63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82

83
84
85
86
87
88
89

dnl SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
dnl CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
dnl POSSIBILITY OF SUCH DAMAGE.
dnl


AC_CONFIG_COMMANDS_PRE([
	AC_SUBST(CC_DEPENDS, $GCC)
	AC_SUBST(CXX_DEPENDS, $GXX)
	AC_SUBST(OBJC_DEPENDS, $GOBJC)
	AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)

	AC_PATH_PROG(TPUT, tput)

	AS_IF([test x"$TPUT" != x""], [
		if x=$($TPUT el 2>/dev/null); then
			AC_SUBST(TERM_EL, "$x")
		else
			AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
		fi

		if x=$($TPUT sgr0 2>/dev/null); then
			AC_SUBST(TERM_SGR0, "$x")
		else
			AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
		fi

		if x=$($TPUT bold 2>/dev/null); then
			AC_SUBST(TERM_BOLD, "$x")
		else
			AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
		fi

		if x=$($TPUT setaf 1 2>/dev/null); then
			AC_SUBST(TERM_SETAF1, "$x")
			AC_SUBST(TERM_SETAF2, "$($TPUT setaf 2 2>/dev/null)")

			AC_SUBST(TERM_SETAF3, "$($TPUT setaf 3 2>/dev/null)")

			AC_SUBST(TERM_SETAF4, "$($TPUT setaf 4 2>/dev/null)")

			AC_SUBST(TERM_SETAF6, "$($TPUT setaf 6 2>/dev/null)")

		else
			AC_SUBST(TERM_SETAF1, "$($TPUT AF 1 2>/dev/null)")

			AC_SUBST(TERM_SETAF2, "$($TPUT AF 2 2>/dev/null)")

			AC_SUBST(TERM_SETAF3, "$($TPUT AF 3 2>/dev/null)")

			AC_SUBST(TERM_SETAF4, "$($TPUT AF 4 2>/dev/null)")

			AC_SUBST(TERM_SETAF6, "$($TPUT AF 6 2>/dev/null)")

		fi
	], [
		AC_SUBST(TERM_EL, '\033\133K')
		AC_SUBST(TERM_SGR0, '\033\133m')
		AC_SUBST(TERM_BOLD, '\033\1331m')
		AC_SUBST(TERM_SETAF1, '\033\13331m')
		AC_SUBST(TERM_SETAF2, '\033\13332m')
		AC_SUBST(TERM_SETAF3, '\033\13333m')
		AC_SUBST(TERM_SETAF4, '\033\13334m')
		AC_SUBST(TERM_SETAF6, '\033\13336m')
	])
])

AC_CONFIG_COMMANDS_POST([
	${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
	for i in $(find . -name Makefile); do
		DEPSFILE="$(dirname $i)/.deps"
		test -f "$DEPSFILE" && rm "$DEPSFILE"
		touch -t 0001010000 "$DEPSFILE"
	done

])

AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
	AC_REQUIRE([AC_CANONICAL_HOST])
	AC_MSG_CHECKING(whether we need an implib)
	case "$host_os" in
		cygwin* | mingw*)








>
|
|
|
|
|

|

|
|
|
|
|
|

|
|
|
|
|

|
|
|
|
|

|
|
|
>
|
>
|
>
|
>
|
|
>
|
>
|
>
|
>
|
>
|
|
|
|
|
|
|
|
|
|
|
|

|
|
|
|
|
|
|
>








17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100

dnl SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
dnl CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
dnl POSSIBILITY OF SUCH DAMAGE.
dnl

AC_DEFUN([BUILDSYS_INIT], [
	AC_CONFIG_COMMANDS_PRE([
		AC_SUBST(CC_DEPENDS, $GCC)
		AC_SUBST(CXX_DEPENDS, $GXX)
		AC_SUBST(OBJC_DEPENDS, $GOBJC)
		AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)

		AC_PATH_PROG(TPUT, tput)

		AS_IF([test x"$TPUT" != x""], [
			if x=$($TPUT el 2>/dev/null); then
				AC_SUBST(TERM_EL, "$x")
			else
				AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
			fi

			if x=$($TPUT sgr0 2>/dev/null); then
				AC_SUBST(TERM_SGR0, "$x")
			else
				AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
			fi

			if x=$($TPUT bold 2>/dev/null); then
				AC_SUBST(TERM_BOLD, "$x")
			else
				AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
			fi

			if x=$($TPUT setaf 1 2>/dev/null); then
				AC_SUBST(TERM_SETAF1, "$x")
				AC_SUBST(TERM_SETAF2,
					"$($TPUT setaf 2 2>/dev/null)")
				AC_SUBST(TERM_SETAF3,
					"$($TPUT setaf 3 2>/dev/null)")
				AC_SUBST(TERM_SETAF4,
					"$($TPUT setaf 4 2>/dev/null)")
				AC_SUBST(TERM_SETAF6,
					"$($TPUT setaf 6 2>/dev/null)")
			else
				AC_SUBST(TERM_SETAF1,
					"$($TPUT AF 1 2>/dev/null)")
				AC_SUBST(TERM_SETAF2,
					"$($TPUT AF 2 2>/dev/null)")
				AC_SUBST(TERM_SETAF3,
					"$($TPUT AF 3 2>/dev/null)")
				AC_SUBST(TERM_SETAF4,
					"$($TPUT AF 4 2>/dev/null)")
				AC_SUBST(TERM_SETAF6,
					"$($TPUT AF 6 2>/dev/null)")
			fi
		], [
			AC_SUBST(TERM_EL, '\033\133K')
			AC_SUBST(TERM_SGR0, '\033\133m')
			AC_SUBST(TERM_BOLD, '\033\1331m')
			AC_SUBST(TERM_SETAF1, '\033\13331m')
			AC_SUBST(TERM_SETAF2, '\033\13332m')
			AC_SUBST(TERM_SETAF3, '\033\13333m')
			AC_SUBST(TERM_SETAF4, '\033\13334m')
			AC_SUBST(TERM_SETAF6, '\033\13336m')
		])
	])

	AC_CONFIG_COMMANDS_POST([
		${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
		for i in $(find . -name Makefile); do
			DEPSFILE="$(dirname $i)/.deps"
			test -f "$DEPSFILE" && rm "$DEPSFILE"
			touch -t 0001010000 "$DEPSFILE"
		done
	])
])

AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
	AC_REQUIRE([AC_CANONICAL_HOST])
	AC_MSG_CHECKING(whether we need an implib)
	case "$host_os" in
		cygwin* | mingw*)
︙︙