Navigation

← Previous Changeset
Next Changeset →

Changeset 19421

Timestamp:

11/08/06 10:24:33 (2 years ago)

Author:

patrick

Message:

Minor touch-ups. No functional changes.

Files:

juggler/trunk/macros/gadget.m4 (modified) (4 diffs)
juggler/trunk/macros/jccl.m4 (modified) (3 diffs)
juggler/trunk/macros/sonix.m4 (modified) (4 diffs)
juggler/trunk/macros/tweek.m4 (modified) (5 diffs)
juggler/trunk/macros/vpr.m4 (modified) (4 diffs)
juggler/trunk/macros/vrj.m4 (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

juggler/trunk/macros/gadget.m4

r19296	r19421
45	45	[ --with-gadgeteer-meta-file=<PATH> Flagpoll metadata file
46	46	for Gadgeteer (optional) [No default]],
47		~~gadget_meta_file="$withval", gadget_meta_file=""~~)
	47	[gadget_meta_file="$withval"], [gadget_meta_file=""])
48	48
49		dnl See if the user specified where to find the ~~meta file~~
50		dnl ~~if they didn't take a guess for them~~
	49	dnl See if the user specified where to find the Gadgeteer meta file. If
	50	dnl not, take a guess.
51	51	if test "x$gadget_meta_file" != "x" ; then
52	52	gadget_flagpoll_args="--from-file=$gadget_meta_file"
…	…
59	59	gadget_flagpoll_args="gadgeteer $gadget_flagpoll_args --no-deps"
60	60
61		AM_PATH_FLAGPOLL([0.7.0], , [AC_MSG_ERROR(* Flagpoll required for Gadgeteer Flags *)])
	61	AM_PATH_FLAGPOLL([0.7.0], ,
	62	[AC_MSG_ERROR(* Flagpoll required for Gadgeteer flags *)])
62	63	min_gadget_version=ifelse([$1], , 0.0.1, $1)
63	64
…	…
72	73	else
73	74	GADGET_CXXFLAGS=`$FLAGPOLL $gadget_flagpoll_args --cflags`
74		GADGET_LIBS=~~"`$FLAGPOLL $gadget_flagpoll_args --get-libs`"~~
75		GADGET_PROF_LIBS=~~"`$FLAGPOLL $gadget_flagpoll_args --get-profiled-libs`"~~
76		GADGET_LIBS_STATIC=~~"`$FLAGPOLL $gadget_flagpoll_args --get-static-libs`"~~
77		GADGET_PROF_LIBS_STATIC=~~"`$FLAGPOLL $gadget_flagpoll_args --get-profiled-static-libs`"~~
	75	GADGET_LIBS=`$FLAGPOLL $gadget_flagpoll_args --get-libs`
	76	GADGET_PROF_LIBS=`$FLAGPOLL $gadget_flagpoll_args --get-profiled-libs`
	77	GADGET_LIBS_STATIC=`$FLAGPOLL $gadget_flagpoll_args --get-static-libs`
	78	GADGET_PROF_LIBS_STATIC=`$FLAGPOLL $gadget_flagpoll_args --get-profiled-static-libs`
78	79	GADGET_EXTRA_LIBS_LD=`$FLAGPOLL $gadget_flagpoll_args --get-extra-libs`
79	80	GADGET_VERSION=`$FLAGPOLL $gadget_flagpoll_args --modversion`
…	…
87	88	if test "x$no_gadgeteer" != x ; then
88	89	if test "$FLAGPOLL" = "no" ; then
89		echo "*** Flagpoll is required to build gadgeteer."
	90	echo "*** Flagpoll is required to build Gadgeteer."
90	91	echo "*** Please check that the PATH variable is set to "
91	92	echo "*** include the proper path to flagpoll."

juggler/trunk/macros/jccl.m4

r19296	r19421
34	34	[ --with-jccl-meta-file=<PATH> Flagpoll metadata file
35	35	for JCCL (optional) [No default]],
36		~~jccl_meta_file="$withval", jccl_meta_file=""~~)
	36	[jccl_meta_file="$withval"], [jccl_meta_file=""])
37	37
38		dnl See if the user specified where to find ~~jccl~~
39		dnl ~~if they didn't take a guess for them~~
	38	dnl See if the user specified where to find the JCCL meta file. If not,
	39	dnl take a guess.
40	40	if test "x$jccl_meta_file" != "x" ; then
41	41	jccl_flagpoll_args="--from-file=$jccl_meta_file"
…	…
47	47
48	48	jccl_flagpoll_args="jccl $jccl_flagpoll_args --no-deps"
49		AM_PATH_FLAGPOLL([0.7.0], , [AC_MSG_ERROR(* Flagpoll required for Jackal Flags *)])
	49	AM_PATH_FLAGPOLL([0.7.0], ,
	50	[AC_MSG_ERROR(* Flagpoll required for JCCl flags *)])
50	51
51	52	dnl Do a sanity check to ensure that $FLAGPOLL actually works.
52	53	if ! (eval $FLAGPOLL --help >/dev/null 2>&1) 2>&1 ; then
53	54	FLAGPOLL='no'
54		echo "*** Flagpoll is required to build ~~jackal~~."
	55	echo "*** Flagpoll is required to build JCCL."
55	56	echo "*** Please check that the PATH variable is set to "
56	57	echo "*** include the proper path to flagpoll."
…	…
164	165
165	166	if test "x$jccl_version_okay" = "xyes" ; then
166		JCCL_JARS=~~"`$FLAGPOLL $jccl_flagpoll_args --get-jars`"~~
	167	JCCL_JARS=`$FLAGPOLL $jccl_flagpoll_args --get-jars`
167	168
168	169	ifelse([$2], , :, [$2])

juggler/trunk/macros/sonix.m4

r19296	r19421
54	54	[ --with-sonix-meta-file=<PATH> Flagpoll metadata file
55	55	for Sonix (optional) [No default]],
56		~~sonix_meta_file="$withval", sonix_meta_file=""~~)
	56	[sonix_meta_file="$withval"], [sonix_meta_file=""])
57	57
58		dnl See if the user specified where to find the ~~meta file~~
59		dnl ~~if they didn't take a guess for them~~
	58	dnl See if the user specified where to find the Sonix meta file. If not,
	59	dnl take a guess.
60	60	if test "x$sonix_meta_file" != "x" ; then
61	61	sonix_flagpoll_args="--from-file=$sonix_meta_file"
…	…
68	68	sonix_flagpoll_args="sonix $sonix_flagpoll_args --no-deps"
69	69
70		AM_PATH_FLAGPOLL([0.7.0], , [AC_MSG_ERROR(* Flagpoll required for Sonix Flags *)])
	70	AM_PATH_FLAGPOLL([0.7.0], ,
	71	[AC_MSG_ERROR(* Flagpoll required for Sonix flags *)])
71	72	min_sonix_version=ifelse([$1], ,0.0.1, [$1])
72	73
…	…
81	82	else
82	83	SNX_CXXFLAGS=`$FLAGPOLL $sonix_flagpoll_args --cflags`
83		SNX_LIBS=~~"`$FLAGPOLL $sonix_flagpoll_args --get-libs`"~~
84		SNX_PROF_LIBS=~~"`$FLAGPOLL $sonix_flagpoll_args --get-profiled-libs`"~~
85		SNX_LIBS_STATIC=~~"`$FLAGPOLL $sonix_flagpoll_args --get-static-libs`"~~
86		SNX_PROF_LIBS_STATIC=~~"`$FLAGPOLL $sonix_flagpoll_args --get-profiled-static-libs`"~~
	84	SNX_LIBS=`$FLAGPOLL $sonix_flagpoll_args --get-libs`
	85	SNX_PROF_LIBS=`$FLAGPOLL $sonix_flagpoll_args --get-profiled-libs`
	86	SNX_LIBS_STATIC=`$FLAGPOLL $sonix_flagpoll_args --get-static-libs`
	87	SNX_PROF_LIBS_STATIC=`$FLAGPOLL $sonix_flagpoll_args --get-profiled-static-libs`
87	88	SNX_EXTRA_LIBS=`$FLAGPOLL $sonix_flagpoll_args --get-extra-libs`
88	89	SNX_VERSION=`$FLAGPOLL $sonix_flagpoll_args --modversion`
…	…
94	95	if test "x$no_sonix" != x ; then
95	96	if test "$FLAGPOLL" = "no" ; then
96		echo "*** Flagpoll is required to build sonix."
	97	echo "*** Flagpoll is required to build Sonix."
97	98	echo "*** Please check that the PATH variable is set to "
98	99	echo "*** include the proper path to flagpoll."

juggler/trunk/macros/tweek.m4

r19296	r19421
34	34	[ --with-tweek-meta-file=<PATH> Flagpoll metadata file
35	35	for VPR (optional) [No default]],
36		~~tweek_meta_file="$withval", tweek_meta_file=""~~)
37
38		dnl See if the user specified where to find ~~vapor~~
39		dnl ~~if they didn't take a guess for them~~
	36	[tweek_meta_file="$withval"], [tweek_meta_file=""])
	37
	38	dnl See if the user specified where to find the Tweek meta file. If not,
	39	dnl take a guess.
40	40	if test "x$tweek_meta_file" != "x" ; then
41	41	tweek_flagpoll_args="--from-file=$tweek_meta_file"
…	…
48	48	tweek_flagpoll_args="tweek $tweek_flagpoll_args --no-deps"
49	49
50		AM_PATH_FLAGPOLL([0.7.0], , [AC_MSG_ERROR(* Flagpoll required for Tweek Flags *)])
	50	AM_PATH_FLAGPOLL([0.7.0], ,
	51	[AC_MSG_ERROR(* Flagpoll required for Tweek flags *)])
51	52
52	53	dnl Do a sanity check to ensure that $FLAGPOLL actually works.
53	54	if ! (eval $FLAGPOLL --help >/dev/null 2>&1) 2>&1 ; then
54	55	FLAGPOLL='no'
55		echo "*** Flagpoll is required to build tweek."
	56	echo "*** Flagpoll is required to build Tweek."
56	57	echo "*** Please check that the PATH variable is set to "
57	58	echo "*** include the proper path to flagpoll."
…	…
133	134	TWEEK_PROF_LIBS_STATIC_LD=`$FLAGPOLL $tweek_flagpoll_args --get-profiled-static-libs`
134	135
135		TWEEK_CXX_IDL=~~"`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idl`"~~
136		TWEEK_CXX_IDL_OPTS=~~"`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlflags`"~~
137		TWEEK_CXX_IDL_GENDIR_OPT=~~"`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlgendir`"~~
138		TWEEK_CXX_IDL_INCFLAG=~~"`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlincflag`"~~
	136	TWEEK_CXX_IDL=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idl`
	137	TWEEK_CXX_IDL_OPTS=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlflags`
	138	TWEEK_CXX_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlgendir`
	139	TWEEK_CXX_IDL_INCFLAG=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlincflag`
139	140
140	141	ifelse([$2], , :, [$2])
…	…
197	198
198	199	if test "x$tweek_version_okay" = "xyes" ; then
199		TWEEK_JAVA_IDL=~~"`$FLAGPOLL $tweek_flagpoll_args --get-java-idl`"~~
200		TWEEK_JAVA_IDL_OPTS=~~"`$FLAGPOLL $tweek_flagpoll_args --get-java-idlflags`"~~
201		TWEEK_JAVA_IDL_GENDIR_OPT=~~"`$FLAGPOLL $tweek_flagpoll_args --get-java-idlgendir`"~~
202		TWEEK_JAVA_IDL_INCFLAG=~~"`$FLAGPOLL $tweek_flagpoll_args --get-java-idlincflag`"~~
203		TWEEK_JARS=~~"`$FLAGPOLL $tweek_flagpoll_args --get-jars`"~~
204		TWEEK_EXT_JARS=~~"`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars`"~~
	200	TWEEK_JAVA_IDL=`$FLAGPOLL $tweek_flagpoll_args --get-java-idl`
	201	TWEEK_JAVA_IDL_OPTS=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlflags`
	202	TWEEK_JAVA_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlgendir`
	203	TWEEK_JAVA_IDL_INCFLAG=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlincflag`
	204	TWEEK_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-jars`
	205	TWEEK_EXT_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars`
205	206
206	207	ifelse([$2], , :, [$2])
…	…
255	256
256	257	if test "x$tweek_version_okay" = "xyes" ; then
257		TWEEK_PYTHON_IDL=~~"`$FLAGPOLL $tweek_flagpoll_args --get-python-idl`"~~
258		TWEEK_PYTHON_IDL_OPTS=~~"`$FLAGPOLL $tweek_flagpoll_args ---get-python-idlflags`"~~
259		TWEEK_PYTHON_IDL_GENDIR_OPT=~~"`$FLAGPOLL $tweek_flagpoll_args --get-python-idlgendir`"~~
260		TWEEK_PYTHON_IDL_INCFLAG=~~"`$FLAGPOLL $tweek_flagpoll_args --get-python-idlincflag`"~~
261		TWEEK_JARS=~~"`$FLAGPOLL $tweek_flagpoll_args --get-jars`"~~
262		TWEEK_EXT_JARS=~~"`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars`"~~
	258	TWEEK_PYTHON_IDL=`$FLAGPOLL $tweek_flagpoll_args --get-python-idl`
	259	TWEEK_PYTHON_IDL_OPTS=`$FLAGPOLL $tweek_flagpoll_args ---get-python-idlflags`
	260	TWEEK_PYTHON_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_flagpoll_args --get-python-idlgendir`
	261	TWEEK_PYTHON_IDL_INCFLAG=`$FLAGPOLL $tweek_flagpoll_args --get-python-idlincflag`
	262	TWEEK_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-jars`
	263	TWEEK_EXT_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars`
263	264
264	265	ifelse([$2], , :, [$2])

juggler/trunk/macros/vpr.m4

r19296	r19421
47	47	[ --with-vpr-meta-file=<PATH> Flagpoll metadata file
48	48	for VPR (optional) [No default]],
49		~~vpr_meta_file="$withval", vpr_meta_file=""~~)
	49	[vpr_meta_file="$withval"], [vpr_meta_file=""])
50	50
51		dnl See if the user specified where to find ~~vapor~~
52		dnl ~~if they didn't take a guess for them~~
	51	dnl See if the user specified where to find the VPR meta file. If not,
	52	dnl take a guess.
53	53	if test "x$vpr_meta_file" != "x" ; then
54	54	vpr_flagpoll_args="--from-file=$vpr_meta_file"
…	…
61	61	vpr_flagpoll_args="vpr $vpr_flagpoll_args --no-deps"
62	62
63		AM_PATH_FLAGPOLL([0.7.0], , [AC_MSG_ERROR(* Flagpoll required for VPR Flags *)])
	63	AM_PATH_FLAGPOLL([0.7.0], ,
	64	[AC_MSG_ERROR(* Flagpoll required for VPR flags *)])
64	65	min_vpr_version=ifelse([$1], ,0.0.1,$1)
65	66
…	…
73	74	no_vpr=yes
74	75	else
75		VPR_CXXFLAGS=~~"`$FLAGPOLL $vpr_flagpoll_args --cflags`"~~
76		VPR_LIBS=~~"`$FLAGPOLL $vpr_flagpoll_args --get-libs`"~~
77		VPR_PROF_LIBS=~~"`$FLAGPOLL $vpr_flagpoll_args --get-profiled-libs`"~~
78		VPR_LIBS_STATIC=~~"`$FLAGPOLL $vpr_flagpoll_args --get-static-libs`"~~
79		VPR_PROF_LIBS_STATIC=~~"`$FLAGPOLL $vpr_flagpoll_args --get-profiled-static-libs`"~~
	76	VPR_CXXFLAGS=`$FLAGPOLL $vpr_flagpoll_args --cflags`
	77	VPR_LIBS=`$FLAGPOLL $vpr_flagpoll_args --get-libs`
	78	VPR_PROF_LIBS=`$FLAGPOLL $vpr_flagpoll_args --get-profiled-libs`
	79	VPR_LIBS_STATIC=`$FLAGPOLL $vpr_flagpoll_args --get-static-libs`
	80	VPR_PROF_LIBS_STATIC=`$FLAGPOLL $vpr_flagpoll_args --get-profiled-static-libs`
80	81	VPR_EXTRA_LIBS=`$FLAGPOLL $vpr_flagpoll_args --get-extra-libs`
81	82	VPR_BUILD_INCLUDES=`$FLAGPOLL $vpr_flagpoll_args --get-build-includes`
…	…
90	91	if test "x$no_vpr" != x ; then
91	92	if test "$FLAGPOLL" = "no" ; then
92		echo "*** Flagpoll is required to build ~~vapor~~."
	93	echo "*** Flagpoll is required to build VPR."
93	94	echo "*** Please check that the PATH variable is set to "
94	95	echo "*** include the proper path to flagpoll."

juggler/trunk/macros/vrj.m4

r19296	r19421
44	44	[ --with-vrjuggler-meta-file=<PATH> Flagpoll metadata file
45	45	for VR Juggler (optional) [No default]],
46		~~vrj_meta_file="$withval", vrj_meta_file=""~~)
	46	[vrj_meta_file="$withval"], [vrj_meta_file=""])
47	47
48		dnl See if the user specified where to find the ~~meta file~~
49		dnl ~~if they didn't take a guess for them~~
	48	dnl See if the user specified where to find the VR Juggler meta file. If
	49	dnl not, take a guess.
50	50	if test "x$vrj_meta_file" != "x" ; then
51	51	vrj_flagpoll_args="--from-file=$vrj_meta_file"
…	…
58	58	vrj_flagpoll_args="vrjuggler $vrj_flagpoll_args --no-deps"
59	59
60		AM_PATH_FLAGPOLL([0.7.0], , [AC_MSG_ERROR(* Flagpoll required for VR Juggler Flags *)])
	60	AM_PATH_FLAGPOLL([0.7.0], ,
	61	[AC_MSG_ERROR(* Flagpoll required for VR Juggler flags *)])
61	62	min_vrj_version=ifelse([$1], ,0.0.1,$1)
62	63
…	…
71	72	else
72	73	VRJ_CXXFLAGS=`$FLAGPOLL $vrj_flagpoll_args --cflags`
73		VRJ_LIBS=~~"`$FLAGPOLL $vrj_flagpoll_args --get-libs`"~~
74		VRJ_PROF_LIBS=~~"`$FLAGPOLL $vrj_flagpoll_args --get-profiled-libs`"~~
75		VRJ_LIBS_STATIC=~~"`$FLAGPOLL $vrj_flagpoll_args --get-static-libs`"~~
76		VRJ_PROF_LIBS_STATIC=~~"`$FLAGPOLL $vrj_flagpoll_args --get-profiled-static-libs`"~~
	74	VRJ_LIBS=`$FLAGPOLL $vrj_flagpoll_args --get-libs`
	75	VRJ_PROF_LIBS=`$FLAGPOLL $vrj_flagpoll_args --get-profiled-libs`
	76	VRJ_LIBS_STATIC=`$FLAGPOLL $vrj_flagpoll_args --get-static-libs`
	77	VRJ_PROF_LIBS_STATIC=`$FLAGPOLL $vrj_flagpoll_args --get-profiled-static-libs`
77	78	VRJ_EXTRA_LIBS=`$FLAGPOLL $vrj_flagpoll_args --get-extra-libs`
78	79	VRJ_VERSION=`$FLAGPOLL $vrj_flagpoll_args --modversion`

Download in other formats: