buildsys  Check-in [a28e8368b3]

Overview
Comment:Remove BUILDSYS_INIT and BUILDSYS_TOUCH_DEPS.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a28e8368b33940d1d255e21da9c9630697a58a657a16a93a5ba9ec26cb66c308
User & Date: js on 2013-07-01 12:56:28
Other Links: manifest | tags
Context
2013-12-10
17:26
Add pre-all and post-all. check-in: 2f6cac75b7 user: js tags: trunk
2013-07-01
12:56
Remove BUILDSYS_INIT and BUILDSYS_TOUCH_DEPS. check-in: a28e8368b3 user: js tags: trunk
2012-11-26
23:13
Add missing AS_DEPENDS. check-in: d4793bdb89 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

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

︙︙
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52

dnl Uncomment the following line if you want to build a shared library.
dnl BUILDSYS_SHARED_LIB

dnl If your program uses plugins and should run on win32 as well, you need to
dnl uncomment the following line
dnl BUILDSYS_PROG_IMPLIB

dnl We need this in order to run some initialization needed by the buildsys
BUILDSYS_INIT
dnl You need to call this to generate the .deps files required by the buildsys.
BUILDSYS_TOUCH_DEPS

dnl If you don't need any extra variables
AC_CONFIG_FILES(buildsys.mk)
dnl If you need any extra variables, they go to extra.mk.
dnl If you use extra variables, comment the line above and uncomment the line
dnl below.
dnl AC_CONFIG_FILES([buildsys.mk extra.mk])









<
<
<
<
<








34
35
36
37
38
39
40





41
42
43
44
45
46
47

dnl Uncomment the following line if you want to build a shared library.
dnl BUILDSYS_SHARED_LIB

dnl If your program uses plugins and should run on win32 as well, you need to
dnl uncomment the following line
dnl BUILDSYS_PROG_IMPLIB






dnl If you don't need any extra variables
AC_CONFIG_FILES(buildsys.mk)
dnl If you need any extra variables, they go to extra.mk.
dnl If you use extra variables, comment the line above and uncomment the line
dnl below.
dnl AC_CONFIG_FILES([buildsys.mk extra.mk])
︙︙

Modified m4/buildsys.m4 from [80a1df42db] to [7883ca1f35].

︙︙
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

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_SUBST(CC_DEPENDS, $GCC)
	AC_SUBST(CXX_DEPENDS, $GXX)
	AC_SUBST(OBJC_DEPENDS, $GOBJC)
	AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)

	AC_PATH_PROG(TPUT, tput)









|








17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

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)
︙︙
68
69
70
71
72
73
74









75
76
77
78
79
80
81

		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_DEFUN([BUILDSYS_PROG_IMPLIB], [
	AC_REQUIRE([AC_CANONICAL_HOST])
	AC_MSG_CHECKING(whether we need an implib)
	case "$host_os" in
		cygwin* | mingw*)
			AC_MSG_RESULT(yes)








>
>
>
>
>
>
>
>
>








68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90

		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*)
			AC_MSG_RESULT(yes)
︙︙
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192

	AC_SUBST(PLUGIN_CFLAGS)
	AC_SUBST(PLUGIN_LDFLAGS)
	AC_SUBST(PLUGIN_SUFFIX)
	AC_SUBST(INSTALL_LIB)
	AC_SUBST(UNINSTALL_LIB)
	AC_SUBST(CLEAN_LIB)
])

AC_DEFUN([BUILDSYS_TOUCH_DEPS], [
	${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
])








<
<
<
<
<
<
<
<
<

186
187
188
189
190
191
192










	AC_SUBST(PLUGIN_CFLAGS)
	AC_SUBST(PLUGIN_LDFLAGS)
	AC_SUBST(PLUGIN_SUFFIX)
	AC_SUBST(INSTALL_LIB)
	AC_SUBST(UNINSTALL_LIB)
	AC_SUBST(CLEAN_LIB)
])