Navigation

← Previous Changeset
Next Changeset →

Changeset 19450

Timestamp:

11/10/06 13:30:28 (2 years ago)

Author:

patrick

Message:

Finish off the transition to using flagpoll by extending the .fpc file for
each of the Juggler modules to identify its dependencies. In this way,
querying a module gives all the paths needed to build against it.
Fortunately for us, Boost is the only dependency we have where neither
pkg-config nor flagpoll support exists. To handle this case, I have written
two short flagpoll files: one for the Boost headers and one for
Boost.Filesystem.

As a result of this change, the following changes to the build are now in
effect:

One of PKG_CONFIG_PATH, FLAGPOLL_PATH, or (DY)LD_LIBRARY_PATH must
be set when building so that flagpoll can find .pc or .fpc files for
dependencies that are not available in the default search path.
Having things installed in the default flagpoll search path eliminates
the need for this extra step.
The configure script options —with-gmtl and —with-cppdom are gone.
Instead, flagpoll finds those dependencies on its own (assuming that
its search path is set up correctly).
It is no longer necessary to have $VJ_BASE_DIR/bin in your path to
build applications. Instead, it is sufficient to include
$VJ_BASE_DIR/lib(64) in (DY)LD_LIBRARY_PATH for flagpoll to be able
to find the .fpc files that it needs. (Strictly speaking, this has
been the case for several months now.)

Files:

juggler/trunk/external/macros/gmtl.m4 (modified) (3 diffs)
juggler/trunk/macros/gadget.m4 (modified) (2 diffs)
juggler/trunk/macros/jccl.m4 (modified) (4 diffs)
juggler/trunk/macros/sonix.m4 (modified) (3 diffs)
juggler/trunk/macros/tweek.m4 (modified) (5 diffs)
juggler/trunk/macros/vpr.m4 (modified) (3 diffs)
juggler/trunk/macros/vrj.m4 (modified) (2 diffs)
juggler/trunk/modules/gadgeteer/configure.ac (modified) (8 diffs)
juggler/trunk/modules/gadgeteer/drivers/configure.ac (modified) (2 diffs)
juggler/trunk/modules/gadgeteer/gadgeteer.fpc.in (modified) (3 diffs)
juggler/trunk/modules/gadgeteer/plugins/configure.ac (modified) (2 diffs)
juggler/trunk/modules/jackal/configure.ac (modified) (7 diffs)
juggler/trunk/modules/jackal/jccl.fpc.in (modified) (4 diffs)
juggler/trunk/modules/jackal/plugins/configure.ac (modified) (3 diffs)
juggler/trunk/modules/sonix/configure.ac (modified) (7 diffs)
juggler/trunk/modules/sonix/plugins/configure.ac (modified) (2 diffs)
juggler/trunk/modules/sonix/sonix.fpc.in (modified) (2 diffs)
juggler/trunk/modules/tweek/configure.ac (modified) (8 diffs)
juggler/trunk/modules/tweek/tweek.fpc.in (modified) (3 diffs)
juggler/trunk/modules/vapor/Makefile.inc.in (modified) (4 diffs)
juggler/trunk/modules/vapor/Makefile.pre.in (modified) (2 diffs)
juggler/trunk/modules/vapor/boost.fpc.in (added)
juggler/trunk/modules/vapor/boost_filesystem.fpc.in (added)
juggler/trunk/modules/vapor/configure.ac (modified) (10 diffs)
juggler/trunk/modules/vapor/test/TestSuite/Makefile.in (modified) (1 diff)
juggler/trunk/modules/vapor/test/TestSuite/test.defs.mk.in (modified) (2 diffs)
juggler/trunk/modules/vapor/vpr.fpc.in (modified) (4 diffs)
juggler/trunk/modules/vrjuggler/configure.ac (modified) (9 diffs)
juggler/trunk/modules/vrjuggler/plugins/configure.ac (modified) (3 diffs)
juggler/trunk/modules/vrjuggler/plugins/corba_perf_mon/Makefile.in (modified) (1 diff)
juggler/trunk/modules/vrjuggler/vrjuggler.fpc.in (modified) (3 diffs)

Legend:

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

juggler/trunk/external/macros/gmtl.m4

r18605	r19450
8	8	dnl -----------------------------------------------------------------
9	9	dnl File: gmtl.m4,v
10		dnl Date modified: 2006/~~04/13 21:49:39~~
11		dnl Version: 1.16
	10	dnl Date modified: 2006/11/09 21:40:01
	11	dnl Version: 1.16.2.2
12	12	dnl -----------------------------------------------------------------
13	13	dnl
…	…
43	43	dnl Arguments:
44	44	dnl version - The minimum required version.
45		~~dnl gmtl-root - The default directory where the GMTL installation~~
46		~~dnl is rooted. This directory should contain an~~
47		~~dnl include/gmtl directory with the GMTL headers.~~
48		~~dnl The value given is used as the default value of~~
49		~~dnl the --with-gmtl-prefix command-line argument.~~
50		~~dnl gmtl-inc - The directory where the GMTL headers can be~~
51		~~dnl found. This is used to override the use of~~
52		~~dnl <gmtl-root>/include as the default path to~~
53		~~dnl those headers. This argument is optional.~~
54	45	dnl action-if-found - The action to take if a GMTL implementation is
55	46	dnl found. This argument is optional.
…	…
59	50	AC_DEFUN([GMTL_PATH],
60	51	[
61		dnl Get the cflags and libraries from the gmtl-config script
62		AC_ARG_WITH(gmtl,
63		[ --with-gmtl=<PATH> Directory where GMTL is
64		installed [default=$2]],
65		[GMTL_ROOT="$withval"], [GMTL_ROOT=$2])
66		AC_ARG_WITH(gmtl-includes,
67		[ --with-gmtl-includes=<DIR>
68		GMTL header file directory [No default]],
69		[gmtl_inc_dir="$withval"],
70		ifelse([$3], , [gmtl_inc_dir='no'], [gmtl_inc_dir=$3]))
71		AC_ARG_WITH(gmtl-exec-prefix,
72		[ --with-gmtl-exec-prefix=<PATH>
73		Exec prefix where GMTL is
74		installed (optional) [No default]],
75		gmtl_config_exec_prefix="$withval", gmtl_config_exec_prefix="")
	52	AC_PATH_PROG(FLAGPOLL, flagpoll, no)
	53	if test "x$FLAGPOLL" = "xno" ; then
	54	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
76	55
77		if test "x$gmtl_config_exec_prefix" != "x" ; then
78		gmtl_config_args="$gmtl_config_args --exec-prefix=$gmtl_config_exec_prefix"
	56	if pkg-config --atleast-pkgconfig-version 0.7 ; then
	57	QUERY_TOOL=$PKG_CONFIG
	58	else
	59	no_gmtl='yes'
	60	PKG_CONFIG='no'
	61	fi
	62	else
	63	QUERY_TOOL=$FLAGPOLL
	64	req_fp_major='0'
	65	req_fp_minor='8'
	66	req_fp_micro='1'
	67	req_fp_version="$req_fp_major.$req_fp_minor.$req_fp_micro"
79	68
80		if test x${GMTL_CONFIG+set} != xset ; then
81		GMTL_CONFIG="$gmtl_config_exec_prefix/bin/gmtl-config"
	69	AC_MSG_CHECKING([whether flagpoll version is >= $req_fp_version])
	70
	71	flagpoll_version=`$FLAGPOLL --version`
	72	fp_major=`echo $flagpoll_version \| \
	73	sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\1/'`
	74	fp_minor=`echo $flagpoll_version \| \
	75	sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\2/'`
	76	fp_micro=`echo $flagpoll_version \| \
	77	sed 's/$[[0-9]]$.$[[0-9]]$.$[[0-9]]*$/\3/'`
	78
	79	ok='no'
	80	if test "$fp_major" -gt "$req_major"; then
	81	ok='yes'
	82	else
	83	if test "$fp_major" -eq "$req_fp_major"; then
	84	if test "$fp_minor" -ge "$req_fp_minor"; then
	85	if test "$fp_micro" -ge "$req_fp_micro"; then
	86	ok='yes'
	87	fi
	88	fi
	89	fi
	90	fi
	91
	92	AC_MSG_RESULT([$ok ($fp_major.$fp_minor.$fp_micro)])
	93
	94	if test "x$ok" != "xyes" ; then
	95	AC_MSG_WARN([* Flagpoll version is too old; version $req_fp_versio or better required. *])
	96	no_gmtl='yes'
	97	FLAGPOLL='no'
82	98	fi
83	99	fi
84	100
85		~~if test "x$GMTL_ROOT" != "x" ; then~~
86		~~gmtl_config_args="$gmtl_config_args --prefix=$GMTL_ROOT"~~
	101	min_gmtl_version=ifelse([$1], ,0.4.11,$1)
	102	AC_MSG_CHECKING([for GMTL version >= $min_gmtl_version])
87	103
88		if test x${GMTL_CONFIG+set} != xset ; then
89		GMTL_CONFIG="$GMTL_ROOT/bin/gmtl-config"
90		fi
	104	GMTL_VERSION=`$QUERY_TOOL gmtl --modversion`
	105	if $QUERY_TOOL gmtl --atleast-version=$min_gmtl_version >/dev/null 2>&1
	106	then
	107	:
	108	else
	109	no_gmtl='yes'
91	110	fi
92	111
93		if test "x$~~GMTL_BASE_DIR" != "x~~" ; then
94		~~gmtl_config_args="$gmtl_config_args --prefix=$GMTL_BASE_DIR"~~
	112	if test "x$no_gmtl" = "xyes" ; then
	113	AC_MSG_RESULT([no ($GMTL_VERSION)])
95	114
96		if test x${GMTL_CONFIG+set} != xset ; then
97		GMTL_CONFIG="$GMTL_BASE_DIR/bin/gmtl-config"
98		fi
	115	ifelse([$3], , :, [$3])
	116	else
	117	AC_MSG_RESULT([yes ($GMTL_VERSION)])
	118
	119	GMTL_CXXFLAGS=`$QUERY_TOOL gmtl --cflags`
	120	GMTL_INCLUDES=`$QUERY_TOOL gmtl --cflags-only-I`
	121
	122	ifelse([$2], , :, [$2])
99	123	fi
100
101		~~AC_PATH_PROG(GMTL_CONFIG, gmtl-config, no)~~
102		~~min_gmtl_version=ifelse([$1], ,0.0.1,$1)~~
103
104		~~dnl Do a sanity check to ensure that $GMTL_CONFIG actually works.~~
105		~~if ! (eval $GMTL_CONFIG --cxxflags >/dev/null 2>&1) 2>&1 ; then~~
106		~~GMTL_CONFIG='no'~~
107		fi
108
109		~~dnl If $GMTL_ROOT has no value, use $GMTL_CONFIG to get it.~~
110		~~if test "x$GMTL_ROOT" = "x" ; then~~
111		~~GMTL_ROOT=`$GMTL_CONFIG $gmtl_config_args --prefix`~~
112		fi
113
114		~~GMTL_CXXFLAGS=''~~
115
116		~~no_gmtl='no'~~
117		~~if test "x$GMTL_CONFIG" = "xno" ; then~~
118		~~no_gmtl='yes'~~
119		~~else~~
120		~~GMTL_CXXFLAGS=`$GMTL_CONFIG $gmtl_config_args --cxxflags`~~
121		fi
122
123		~~ggt_save_CPPFLAGS="$CPPFLAGS"~~
124		~~CPPFLAGS="$GMTL_CXXFLAGS $CPPFLAGS"~~
125
126		~~dnl Add the user-specified GMTL installation directory to the preprocessor~~
127		~~dnl arguments. Ensure that /usr/include is not included multiple times if~~
128		~~dnl $GMTL_ROOT is "/usr". The goal here is to let the user specify either~~
129		~~dnl the GMTL root directory, the GMTL include directory, or both.~~
130		~~if test "x$GMTL_ROOT" != "x/usr" -o "x$gmtl_inc_dir" != "xno" ; then~~
131		~~dnl No GMTL include directory, so append "/include" to $GMTL_ROOT.~~
132		~~if test "x$gmtl_inc_dir" = "xno" ; then~~
133		~~ggt_gmtl_incdir="$GMTL_ROOT/include"~~
134		~~dnl We have a GMTL include directory, so we'll use it and hope for~~
135		~~dnl the best.~~
136		~~else~~
137		~~ggt_gmtl_incdir="$gmtl_inc_dir"~~
138		fi
139
140		~~CPPFLAGS="$CPPFLAGS -I$ggt_gmtl_incdir"~~
141		~~else~~
142		~~ggt_gmtl_incdir="$GMTL_ROOT/include"~~
143		fi
144
145		~~AC_LANG_SAVE~~
146		~~AC_LANG_CPLUSPLUS~~
147		~~AC_CHECK_HEADER([gmtl/Version.h], [ggt_have_gmtl='yes'], [$5])~~
148		~~AC_LANG_RESTORE~~
149
150		~~dnl Restore all the variables now that we are done testing.~~
151		~~CPPFLAGS="$ggt_save_CPPFLAGS"~~
152
153		~~dnl Do the version number comparison.~~
154		~~if test "x$ggt_have_gmtl" = "xyes" ; then~~
155		~~dnl This expression passed to grep(1) is not great. It could stand to~~
156		~~dnl test for one or more whitespace characters instead of just one for~~
157		~~dnl book-ending GMTL_VERSION_*.~~
158		~~gmtl_patch=`grep 'define GMTL_VERSION_PATCH ' $ggt_gmtl_incdir/gmtl/Version.h \| awk '{ print $[3] }' -`~~
159		~~gmtl_minor=`grep 'define GMTL_VERSION_MINOR ' $ggt_gmtl_incdir/gmtl/Version.h \| awk '{ print $[3] }' -`~~
160		~~gmtl_major=`grep 'define GMTL_VERSION_MAJOR ' $ggt_gmtl_incdir/gmtl/Version.h \| awk '{ print $[3] }' -`~~
161		~~gmtl_version="$gmtl_major.$gmtl_minor.$gmtl_patch"~~
162
163		~~AC_MSG_CHECKING([whether GMTL version is >= $1])~~
164		~~AC_MSG_RESULT([$gmtl_version])~~
165		~~DPP_VERSION_CHECK([$gmtl_version], [$1], ,~~
166		~~[ggt_have_gmtl='no'~~
167		~~$5])~~
168		fi
169
170		~~if test "x$ggt_have_gmtl" = "xyes" ; then~~
171		~~ifelse([$4], , :, [$4])~~
172		fi
173
174		~~dnl If GMTL API files were found, define this extra stuff that may be~~
175		~~dnl helpful in some Makefiles.~~
176		~~if test "x$ggt_have_gmtl" = "xyes" ; then~~
177		~~if test "x$ggt_gmtl_incdir" != "x" ; then~~
178		~~GMTL_INCLUDES="-I$ggt_gmtl_incdir"~~
179		fi
180
181		~~GMTL='yes'~~
182		fi
183
184		~~dnl XXX: Get this working again.~~
185		~~dnl if test "x$no_gmtl" = "xyes" ; then~~
186		~~dnl if test "$GMTL_CONFIG" = "no" ; then~~
187		~~dnl echo "*** The gmtl-config script installed by GMTL could not be found"~~
188		~~dnl echo "*** If GMTL was installed in PREFIX, make sure"~~
189		~~dnl echo "*** PREFIX/include/gmtl exists."~~
190		~~dnl fi~~
191		~~dnl GMTL_VERSION='-1'~~
192		~~dnl ifelse([$4], , :, [$4])~~
193		~~dnl fi~~
194	124
195	125	AC_SUBST(GMTL_CXXFLAGS)

juggler/trunk/macros/gadget.m4

r19421	r19450
50	50	dnl not, take a guess.
51	51	if test "x$gadget_meta_file" != "x" ; then
52		gadget_flagpoll_args="--from-file=$gadget_meta_file"
	52	gadget_meta_dir=`dirname $gadget_meta_file`
	53	gadget_flagpoll_args="--extra-paths=$gadget_meta_dir gadgeteer --from-file=$gadget_meta_file"
53	54	elif test -f "$instlinks/share/flagpoll/gadgeteer.fpc" ; then
54		gadget_flagpoll_args="--from-file=$instlinks/share/flagpoll/gadgeteer.fpc"
	55	gadget_meta_dir="$instlinks/share/flagpoll"
	56	gadget_flagpoll_args="--extra-paths=$gadget_meta_dir gadgeteer --from-file=$gadget_meta_dir/gadgeteer.fpc"
55	57	else
56		gadget_flagpoll_args=""
	58	gadget_flagpoll_args="gadgeteer"
57	59	fi
58	60
59		gadget_flagpoll_args="gadgeteer $gadget_flagpoll_args --no-deps"
60
61		AM_PATH_FLAGPOLL([0.7.0], ,
	61	AM_PATH_FLAGPOLL([0.8.1], ,
62	62	[AC_MSG_ERROR(* Flagpoll required for Gadgeteer flags *)])
63		min_gadget_version=ifelse([$1], , ~~0.0.1, $1~~)
	63	min_gadget_version=ifelse([$1], ,0.0.1,[$1])
64	64
65	65	dnl Do a sanity check to ensure that $FLAGPOLL actually works.
…	…
72	72	no_gadgeteer=yes
73	73	else
74		GADGET_CXXFLAGS=`$FLAGPOLL $gadget_flagpoll_args --cflags`
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`
79		GADGET_EXTRA_LIBS_LD=`$FLAGPOLL $gadget_flagpoll_args --get-extra-libs`
80		GADGET_VERSION=`$FLAGPOLL $gadget_flagpoll_args --modversion`
	74	if ! (eval $FLAGPOLL $gadget_flagpoll_args --modversion >/dev/null 2>&1)
	75	then
	76	AC_MSG_WARN([* Flagpoll has no valid Gadgeteer configuration *])
	77	no_gadgeteer=yes
	78	else
	79	GADGET_CXXFLAGS=`$FLAGPOLL $gadget_flagpoll_args --cflags`
	80	GADGET_LIBS=`$FLAGPOLL $gadget_flagpoll_args --libs`
	81	GADGET_PROF_LIBS=`$FLAGPOLL $gadget_flagpoll_args --get-profiled-libs`
	82	GADGET_LIBS_STATIC=`$FLAGPOLL $gadget_flagpoll_args --get-static-libs`
	83	GADGET_PROF_LIBS_STATIC=`$FLAGPOLL $gadget_flagpoll_args --get-profiled-static-libs`
	84	GADGET_EXTRA_LIBS_LD=`$FLAGPOLL $gadget_flagpoll_args --get-extra-libs`
	85	GADGET_VERSION=`$FLAGPOLL $gadget_flagpoll_args --modversion`
81	86
82		GADGET_USE_X11=`$FLAGPOLL $gadget_flagpoll_args --get-use-x11`
	87	GADGET_USE_X11=`$FLAGPOLL $gadget_flagpoll_args --get-use-x11`
83	88
84		DPP_VERSION_CHECK_MSG_NO_CACHE([Gadgeteer], [$GADGET_VERSION],
85		[$min_gadget_version], [$2], [$3])
	89	DPP_VERSION_CHECK_MSG_NO_CACHE([Gadgeteer], [$GADGET_VERSION],
	90	[$min_gadget_version], [$2], [$3])
	91	fi
86	92	fi
87	93

juggler/trunk/macros/jccl.m4

r19421	r19450
32	32	dnl Get the cflags and libraries from the flagpoll script
33	33	AC_ARG_WITH(jccl-meta-file,
34		[ --with-jccl-meta-file=<PATH> Flagpoll metadata file
35		for JCCL (optional) [No default]],
	34	[ --with-jccl-meta-file=<PATH>
	35	Flagpoll metadata file for JCCL
	36	(optional) [No default]],
36	37	[jccl_meta_file="$withval"], [jccl_meta_file=""])
37	38
…	…
39	40	dnl take a guess.
40	41	if test "x$jccl_meta_file" != "x" ; then
41		jccl_flagpoll_args="--from-file=$jccl_meta_file"
	42	jccl_meta_dir=`dirname $jccl_meta_file`
	43	jccl_flagpoll_args="--extra-paths=$jccl_meta_dir jccl --from-file=$jccl_meta_file"
42	44	elif test -f "$instlinks/share/flagpoll/jccl.fpc" ; then
43		jccl_flagpoll_args="--from-file=$instlinks/share/flagpoll/jccl.fpc"
	45	jccl_meta_dir="$instlinks/share/flagpoll"
	46	jccl_flagpoll_args="--extra-paths=$jccl_meta_dir jccl --from-file=$jccl_meta_dir/jccl.fpc"
44	47	else
45		jccl_flagpoll_args=""
	48	jccl_flagpoll_args="jccl"
46	49	fi
47	50
48		jccl_flagpoll_args="jccl $jccl_flagpoll_args --no-deps"
49		AM_PATH_FLAGPOLL([0.7.0], ,
50		[AC_MSG_ERROR(* Flagpoll required for JCCl flags *)])
	51	AM_PATH_FLAGPOLL([0.8.1], ,
	52	[AC_MSG_ERROR(* Flagpoll required for JCCL flags *)])
51	53
52	54	dnl Do a sanity check to ensure that $FLAGPOLL actually works.
…	…
72	74	ifelse([$3], , :, [$3])
73	75	else
74		JCCL_VERSION=`$FLAGPOLL $jccl_flagpoll_args --modversion`
75
76		min_jccl_version=ifelse([$1], , 0.0.1, $1)
77		DPP_VERSION_CHECK_MSG_NO_CACHE([JCCL], [$JCCL_VERSION],
78		[$min_jccl_version], [$2], [$3])
79		fi
	76	if ! (eval $FLAGPOLL $jccl_flagpoll_args --modversion >/dev/null 2>&1)
	77	then
	78	AC_MSG_ERROR([* Flagpoll has no valid JCCL configuration *])
	79	ifelse([$3], , :, [$3])
	80	else
	81	JCCL_VERSION=`$FLAGPOLL $jccl_flagpoll_args --modversion`
	82
	83	min_jccl_version=ifelse([$1], ,0.0.1,[$1])
	84	DPP_VERSION_CHECK_MSG_NO_CACHE([JCCL], [$JCCL_VERSION],
	85	[$min_jccl_version], [$2], [$3])
	86	fi
	87	fi
	88
	89	AC_SUBST(JCCL_VERSION)
80	90	])
81	91
…	…
116	126	if test "x$jccl_version_okay" = "xyes" ; then
117	127	JCCL_CXXFLAGS=`$FLAGPOLL $jccl_flagpoll_args --cflags `
118		JCCL_LIBS=`$FLAGPOLL $jccl_flagpoll_args --~~get-~~libs`
	128	JCCL_LIBS=`$FLAGPOLL $jccl_flagpoll_args --libs`
119	129	JCCL_EXTRA_LIBS=`$FLAGPOLL $jccl_flagpoll_args --get-extra-libs`
120	130	JCCL_PROF_LIBS=`$FLAGPOLL $jccl_flagpoll_args --get-profiled-libs`

juggler/trunk/macros/sonix.m4

r19421	r19450
52	52	dnl Get the cflags and libraries from flagpoll
53	53	AC_ARG_WITH(sonix-meta-file,
54		[ --with-sonix-meta-file=<PATH> Flagpoll metadata file
55		for Sonix (optional) [No default]],
	54	[ --with-sonix-meta-file=<PATH>
	55	Flagpoll metadata file for
	56	Sonix (optional) [No default]],
56	57	[sonix_meta_file="$withval"], [sonix_meta_file=""])
57	58
…	…
59	60	dnl take a guess.
60	61	if test "x$sonix_meta_file" != "x" ; then
61		sonix_flagpoll_args="--from-file=$sonix_meta_file"
	62	sonix_meta_dir=`dirname $sonix_meta_file`
	63	sonix_flagpoll_args="--extra-paths=$sonix_meta_dir sonix --from-file=$sonix_meta_file"
62	64	elif test -f "$instlinks/share/flagpoll/sonix.fpc" ; then
63		sonix_flagpoll_args="--from-file=$instlinks/share/flagpoll/sonix.fpc"
	65	sonix_meta_dir="$instlinks/share/flagpoll"
	66	sonix_flagpoll_args="--extra-paths=$sonix_meta_dir sonix --from-file=$sonix_meta_dir/sonix.fpc"
64	67	else
65		sonix_flagpoll_args=""
	68	sonix_flagpoll_args="sonix"
66	69	fi
67	70
68		sonix_flagpoll_args="sonix $sonix_flagpoll_args --no-deps"
69
70		AM_PATH_FLAGPOLL([0.7.0], ,
	71	AM_PATH_FLAGPOLL([0.8.1], ,
71	72	[AC_MSG_ERROR(* Flagpoll required for Sonix flags *)])
72		min_sonix_version=ifelse([$1], ,0.0.1, [$1])
	73	min_sonix_version=ifelse([$1], ,0.0.1,[$1])
73	74
74	75	dnl Do a sanity check to ensure that $FLAGPOLL actually works.
…	…
81	82	no_sonix=yes
82	83	else
83		SNX_CXXFLAGS=`$FLAGPOLL $sonix_flagpoll_args --cflags`
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`
88		SNX_EXTRA_LIBS=`$FLAGPOLL $sonix_flagpoll_args --get-extra-libs`
89		SNX_VERSION=`$FLAGPOLL $sonix_flagpoll_args --modversion`
	84	if ! (eval $FLAGPOLL $sonix_flagpoll_args --modversion >/dev/null 2>&1)
	85	then
	86	AC_MSG_WARN([* Flagpoll has no valid Sonix configuration *])
	87	no_sonix=yes
	88	else
	89	SNX_CXXFLAGS=`$FLAGPOLL $sonix_flagpoll_args --cflags`
	90	SNX_LIBS=`$FLAGPOLL $sonix_flagpoll_args --libs`
	91	SNX_PROF_LIBS=`$FLAGPOLL $sonix_flagpoll_args --get-profiled-libs`
	92	SNX_LIBS_STATIC=`$FLAGPOLL $sonix_flagpoll_args --get-static-libs`
	93	SNX_PROF_LIBS_STATIC=`$FLAGPOLL $sonix_flagpoll_args --get-profiled-static-libs`
	94	SNX_EXTRA_LIBS=`$FLAGPOLL $sonix_flagpoll_args --get-extra-libs`
	95	SNX_VERSION=`$FLAGPOLL $sonix_flagpoll_args --modversion`
90	96
91		DPP_VERSION_CHECK_MSG_NO_CACHE([Sonix], [$SNX_VERSION],
92		[$min_sonix_version], [$2], [$3])
	97	DPP_VERSION_CHECK_MSG_NO_CACHE([Sonix], [$SNX_VERSION],
	98	[$min_sonix_version], [$2], [$3])
	99	fi
93	100	fi
94	101

juggler/trunk/macros/tweek.m4

r19421	r19450
32	32	dnl Get the cflags and libraries from flagpoll
33	33	AC_ARG_WITH(tweek-meta-file,
34		[ --with-tweek-meta-file=<PATH> Flagpoll metadata file
35		for VPR (optional) [No default]],
	34	[ --with-tweek-meta-file=<PATH>
	35	Flagpoll metadata file for
	36	Tweek (optional) [No default]],
36	37	[tweek_meta_file="$withval"], [tweek_meta_file=""])
37	38
…	…
39	40	dnl take a guess.
40	41	if test "x$tweek_meta_file" != "x" ; then
41		tweek_flagpoll_args="--from-file=$tweek_meta_file"
	42	tweek_meta_dir=`dirname $tweek_meta_file`
	43	tweek_flagpoll_args="--extra-paths=$tweek_meta_dir tweek --from-file=$tweek_meta_file"
42	44	elif test -f "$instlinks/share/flagpoll/tweek.fpc" ; then
43		tweek_flagpoll_args="--from-file=$instlinks/share/flagpoll/tweek.fpc"
	45	tweek_meta_dir="$instlinks/share/flagpoll"
	46	tweek_flagpoll_args="--extra-paths=$tweek_meta_dir tweek --from-file=$tweek_meta_dir/tweek.fpc"
44	47	else
45		tweek_flagpoll_args=""
	48	tweek_flagpoll_args="tweek"
46	49	fi
47	50
48		tweek_flagpoll_args="tweek $tweek_flagpoll_args --no-deps"
49
50		AM_PATH_FLAGPOLL([0.7.0], ,
	51	AM_PATH_FLAGPOLL([0.8.1], ,
51	52	[AC_MSG_ERROR(* Flagpoll required for Tweek flags *)])
52	53
…	…
77	78	TWEEK_VERSION=`$FLAGPOLL $tweek_flagpoll_args --modversion`
78	79
79		min_tweek_version=ifelse([$1], , ~~0.0.1, $1~~)
	80	min_tweek_version=ifelse([$1], ,0.0.1,[$1])
80	81	DPP_VERSION_CHECK_MSG_NO_CACHE([Tweek], [$TWEEK_VERSION],
81	82	[$min_tweek_version], [$2], [$3])
…	…
115	116	ifelse([$3], , :, [$3])
116	117	else
117		AC_MSG_CHECKING([whether Tweek C++ API is available])
118		has_cxx=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-api-available`
119
120		if test "x$has_cxx" = "xY" ; then
121		AC_MSG_RESULT([yes])
122		if test "x$TWEEK_VERSION" = "x" ; then
123		_TWEEK_VERSION_CHECK($1, [tweek_version_okay='yes'],
124		[tweek_version_okay='no'
125		$3])
	118	if ! (eval $FLAGPOLL $tweek_flagpoll_args --modversion >/dev/null 2>&1)
	119	then
	120	AC_MSG_ERROR([* Flagpoll has no valid Tweek configuration *])
	121	ifelse([$3], , :, [$3])
	122	else
	123	AC_MSG_CHECKING([whether Tweek C++ API is available])
	124	has_cxx=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-api-available`
	125
	126	if test "x$has_cxx" = "xY" ; then
	127	AC_MSG_RESULT([yes])
	128	if test "x$TWEEK_VERSION" = "x" ; then
	129	_TWEEK_VERSION_CHECK($1, [tweek_version_okay='yes'],
	130	[tweek_version_okay='no'
	131	$3])
	132	fi
	133
	134	if test "x$tweek_version_okay" = "xyes" ; then
	135	TWEEK_CXXFLAGS=`$FLAGPOLL $tweek_flagpoll_args --cflags`
	136	TWEEK_LIBS=`$FLAGPOLL $tweek_flagpoll_args --libs`
	137	TWEEK_EXTRA_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-extra-libs`
	138	TWEEK_PROF_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-profiled_libs`
	139	TWEEK_LIBS_STATIC=`$FLAGPOLL $tweek_flagpoll_args --get-static-libs`
	140	TWEEK_PROF_LIBS_STATIC_LD=`$FLAGPOLL $tweek_flagpoll_args --get-profiled-static-libs`
	141
	142	TWEEK_CXX_IDL=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idl`
	143	TWEEK_CXX_IDL_OPTS=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlflags`
	144	TWEEK_CXX_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlgendir`
	145	TWEEK_CXX_IDL_INCFLAG=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlincflag`
	146
	147	ifelse([$2], , :, [$2])
	148	fi
	149	else
	150	AC_MSG_RESULT([no])
	151	ifelse([$3], , :, [$3])
126	152	fi
127
128		~~if test "x$tweek_version_okay" = "xyes" ; then~~
129		~~TWEEK_CXXFLAGS=`$FLAGPOLL $tweek_flagpoll_args --cflags`~~
130		~~TWEEK_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-libs`~~
131		~~TWEEK_EXTRA_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-extra-libs`~~
132		~~TWEEK_PROF_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-profiled_libs`~~
133		~~TWEEK_LIBS_STATIC=`$FLAGPOLL $tweek_flagpoll_args --get-static-libs`~~
134		~~TWEEK_PROF_LIBS_STATIC_LD=`$FLAGPOLL $tweek_flagpoll_args --get-profiled-static-libs`~~
135
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`~~
140
141		~~ifelse([$2], , :, [$2])~~
142		fi
143		~~else~~
144		~~AC_MSG_RESULT([no])~~
145		~~ifelse([$3], , :, [$3])~~
146	153	fi
147	154	fi
…	…
186	193	ifelse([$3], , :, [$3])
187	194	else
188		AC_MSG_CHECKING([whether Tweek Java API is available])
189		has_java=`$FLAGPOLL $tweek_flagpoll_args --get-java-api-available`
190
191		if test "x$has_java" = "xY" ; then
192		AC_MSG_RESULT([yes])
193		if test "x$TWEEK_VERSION" = "x" ; then
194		_TWEEK_VERSION_CHECK($1, [tweek_version_okay='yes'],
195		[tweek_version_okay='no'
196		$3])
	195	if ! (eval $FLAGPOLL $tweek_flagpoll_args --modversion >/dev/null 2>&1)
	196	then
	197	AC_MSG_ERROR([* Flagpoll has no valid Tweek configuration *])
	198	ifelse([$3], , :, [$3])
	199	else
	200	AC_MSG_CHECKING([whether Tweek Java API is available])
	201	has_java=`$FLAGPOLL $tweek_flagpoll_args --get-java-api-available`
	202
	203	if test "x$has_java" = "xY" ; then
	204	AC_MSG_RESULT([yes])
	205	if test "x$TWEEK_VERSION" = "x" ; then
	206	_TWEEK_VERSION_CHECK($1, [tweek_version_okay='yes'],
	207	[tweek_version_okay='no'
	208	$3])
	209	fi
	210
	211	if test "x$tweek_version_okay" = "xyes" ; then
	212	TWEEK_JAVA_IDL=`$FLAGPOLL $tweek_flagpoll_args --get-java-idl`
	213	TWEEK_JAVA_IDL_OPTS=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlflags`
	214	TWEEK_JAVA_IDL_GENDIR_OPT=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlgendir`
	215	TWEEK_JAVA_IDL_INCFLAG=`$FLAGPOLL $tweek_flagpoll_args --get-java-idlincflag`
	216	TWEEK_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-jars`
	217	TWEEK_EXT_JARS=`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars`
	218
	219	ifelse([$2], , :, [$2])
	220	fi
	221	else
	222	AC_MSG_RESULT([no])
	223	ifelse([$3], , :, [$3])
197	224	fi
198
199		~~if test "x$tweek_version_okay" = "xyes" ; then~~
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`~~
206
207		~~ifelse([$2], , :, [$2])~~
208		fi
209		~~else~~
210		~~AC_MSG_RESULT([no])~~
211		~~ifelse([$3], , :, [$3])~~
212	225	fi
213	226	fi

juggler/trunk/macros/vpr.m4

r19421	r19450
45	45	dnl Get the cflags and libraries from flagpoll
46	46	AC_ARG_WITH(vpr-meta-file,
47		[ --with-vpr-meta-file=<PATH> Flagpoll metadata file
48		for VPR (optional) [No default]],
	47	[ --with-vpr-meta-file=<PATH>
	48	Flagpoll metadata file for VPR
	49	(optional) [No default]],
49	50	[vpr_meta_file="$withval"], [vpr_meta_file=""])
50	51
…	…
52	53	dnl take a guess.
53	54	if test "x$vpr_meta_file" != "x" ; then
54		vpr_flagpoll_args="--from-file=$vpr_meta_file"
	55	vpr_meta_dir=`dirname $vpr_meta_file`
	56	vpr_flagpoll_args="--extra-paths=$vpr_meta_dir vpr --from-file=$vpr_meta_file"
55	57	elif test -f "$instlinks/share/flagpoll/vpr.fpc" ; then
56		vpr_flagpoll_args="--from-file=$instlinks/share/flagpoll/vpr.fpc"
	58	vpr_meta_dir="$instlinks/share/flagpoll"
	59	vpr_flagpoll_args="--extra-paths=$vpr_meta_dir vpr --from-file=$vpr_meta_dir/vpr.fpc"
57	60	else
58		vpr_flagpoll_args=""
	61	vpr_flagpoll_args="vpr"
59	62	fi
60	63
61		vpr_flagpoll_args="vpr $vpr_flagpoll_args --no-deps"
62
63		AM_PATH_FLAGPOLL([0.7.0], ,
	64	AM_PATH_FLAGPOLL([0.8.1], ,
64	65	[AC_MSG_ERROR(* Flagpoll required for VPR flags *)])
65	66	min_vpr_version=ifelse([$1], ,0.0.1,$1)
…	…
74	75	no_vpr=yes
75	76	else
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`
81		VPR_EXTRA_LIBS=`$FLAGPOLL $vpr_flagpoll_args --get-extra-libs`
82		VPR_BUILD_INCLUDES=`$FLAGPOLL $vpr_flagpoll_args --get-build-includes`
	77	if ! (eval $FLAGPOLL $vpr_flagpoll_args --modversion >/dev/null 2>&1)
	78	then
	79	AC_MSG_WARN([* Flagpoll has no valid VPR configuration *])
	80	no_vpr=yes
	81	else
	82	VPR_CXXFLAGS=`$FLAGPOLL $vpr_flagpoll_args --cflags`
	83	VPR_LIBS=`$FLAGPOLL $vpr_flagpoll_args --libs`
	84	VPR_PROF_LIBS=`$FLAGPOLL $vpr_flagpoll_args --get-profiled-libs`
	85	VPR_LIBS_STATIC=`$FLAGPOLL $vpr_flagpoll_args --get-static-libs`
	86	VPR_PROF_LIBS_STATIC=`$FLAGPOLL $vpr_flagpoll_args --get-profiled-static-libs`
	87	VPR_EXTRA_LIBS=`$FLAGPOLL $vpr_flagpoll_args --get-extra-libs`
83	88
84		VPR_SUBSYSTEM=`$FLAGPOLL $vpr_flagpoll_args --get-subsystem`
85		VPR_VERSION=`$FLAGPOLL $vpr_flagpoll_args --modversion`
	89	VPR_SUBSYSTEM=`$FLAGPOLL $vpr_flagpoll_args --get-subsystem`
	90	VPR_VERSION=`$FLAGPOLL $vpr_flagpoll_args --modversion`
86	91
87		DPP_VERSION_CHECK_MSG_NO_CACHE([VPR], [$VPR_VERSION],
88		[$min_vpr_version], [$2], [$3])
	92	DPP_VERSION_CHECK_MSG_NO_CACHE([VPR], [$VPR_VERSION],
	93	[$min_vpr_version], [$2], [$3])
	94	fi
89	95	fi
90	96

juggler/trunk/macros/vrj.m4

r19421	r19450
49	49	dnl not, take a guess.
50	50	if test "x$vrj_meta_file" != "x" ; then
51		vrj_flagpoll_args="--from-file=$vrj_meta_file"
	51	vrj_meta_dir=`dirname $vrj_meta_file`
	52	vrj_flagpoll_args="--extra-paths=$vrj_meta_dir vrj --from-file=$vrj_meta_file"
52	53	elif test -f "$instlinks/share/flagpoll/vrjuggler.fpc" ; then
53		vrj_flagpoll_args="--from-file=$instlinks/share/flagpoll/vrjuggler.fpc"
	54	vrj_meta_dir="$instlinks/share/flagpoll"
	55	vrj_flagpoll_args="--extra-paths=$vrj_meta_dir vrjuggler --from-file=$vrj_meta_dir/vrjuggler.fpc"
54	56	else
55		vrj_flagpoll_args=""
	57	vrj_flagpoll_args="vrjuggler"
56	58	fi
57	59
58		vrj_flagpoll_args="vrjuggler $vrj_flagpoll_args --no-deps"
59
60		AM_PATH_FLAGPOLL([0.7.0], ,
	60	AM_PATH_FLAGPOLL([0.8.1], ,
61	61	[AC_MSG_ERROR(* Flagpoll required for VR Juggler flags *)])
62	62	min_vrj_version=ifelse([$1], ,0.0.1,$1)
…	…
71	71	no_vrj=yes
72	72	else
73		VRJ_CXXFLAGS=`$FLAGPOLL $vrj_flagpoll_args --cflags`
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`
78		VRJ_EXTRA_LIBS=`$FLAGPOLL $vrj_flagpoll_args --get-extra-libs`
79		VRJ_VERSION=`$FLAGPOLL $vrj_flagpoll_args --modversion`
	73	if ! (eval $FLAGPOLL $vrj_flagpoll_args --modversion >/dev/null 2>&1)
	74	then
	75	AC_MSG_WARN([* Flagpoll has no valid VR Juggler configuration *])
	76	no_vrj=yes
	77	else
	78	VRJ_CXXFLAGS=`$FLAGPOLL $vrj_flagpoll_args --cflags`
	79	VRJ_LIBS=`$FLAGPOLL $vrj_flagpoll_args --libs`
	80	VRJ_PROF_LIBS=`$FLAGPOLL $vrj_flagpoll_args --get-profiled-libs`
	81	VRJ_LIBS_STATIC=`$FLAGPOLL $vrj_flagpoll_args --get-static-libs`
	82	VRJ_PROF_LIBS_STATIC=`$FLAGPOLL $vrj_flagpoll_args --get-profiled-static-libs`
	83	VRJ_EXTRA_LIBS=`$FLAGPOLL $vrj_flagpoll_args --get-extra-libs`
	84	VRJ_VERSION=`$FLAGPOLL $vrj_flagpoll_args --modversion`
80	85
81		DPP_VERSION_CHECK_MSG_NO_CACHE([VR Juggler], [$VRJ_VERSION],
82		[$min_vrj_version], [$2], [$3])
	86	DPP_VERSION_CHECK_MSG_NO_CACHE([VR Juggler], [$VRJ_VERSION],
	87	[$min_vrj_version], [$2], [$3])
	88	fi
83	89	fi
84	90

juggler/trunk/modules/gadgeteer/configure.ac

r19365	r19450
160	160	# Checks for libraries.
161	161	# -----------------------------------------------------------------------------
162		VPR_PATH([1.1.35], , [AC_MSG_ERROR([* VPR required for Gadgeteer *])])
	162	MIN_VPR_VERSION='1.1.35'
	163	VPR_PATH([$MIN_VPR_VERSION], ,
	164	[AC_MSG_ERROR([* VPR required for Gadgeteer *])])
163	165	#VPR_SUBSYSTEM=`$VPR_CONFIG --subsystem`
164		JCCL_PATH_CXX([1.1.5], ,
	166	MIN_JCCL_VERSION='1.1.5'
	167	JCCL_PATH_CXX([$MIN_JCCL_VERSION], ,
165	168	[AC_MSG_ERROR([* JCCL C++ API required for Gadgeteer *])])
166	169
167		gadsave_CPPFLAGS="$CPPFLAGS"
168		CPPFLAGS="$CPPFLAGS $STDFLAGS"
169		GMTL_PATH(0.1.9, [/usr/local], , ,
	170	MIN_GMTL_VERSION='0.4.11'
	171	GMTL_PATH([$MIN_GMTL_VERSION], ,
170	172	[AC_MSG_ERROR([* GMTL required for Gadgeteer *])])
171		~~CPPFLAGS="$gadsave_CPPFLAGS"~~
172	173
173	174	AC_PATH_XTRA
…	…
248	249	#fi
249	250
250		CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES ~~$VPR_BUILD_INCLUDES~~"
	251	CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES"
251	252	BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS"
252		DEPEND_FLAGS="$VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES ~~$VPR_BUILD_INCLUDES~~"
	253	DEPEND_FLAGS="$VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES"
253	254	gadget_cxxflags="$STDFLAGS"
254	255
…	…
295	296	# application.
296	297	if test "x$OS_TYPE" = "xWin32" ; then
297		APP_EXTRA_LIBS="$LDFLAGS $JCCL_LIBS $~~JCCL_EXTRA_LIBS $VPR_LIBS $LIBS $VPR_EXTRA_~~LIBS comctl32.lib gdi32.lib user32.lib"
	298	APP_EXTRA_LIBS="$LDFLAGS $JCCL_LIBS $LIBS comctl32.lib gdi32.lib user32.lib"
298	299	APP_EXTRA_PROF_LIBS="$APP_EXTRA_LIBS"
299	300	else
300		APP_EXTRA_LIBS="$LDFLAGS $JCCL_LIBS $~~JCCL_EXTRA_LIBS $VPR_LIBS $LIBS $DTK_LDFLAGS $VPR_EXTRA_LIB~~S"
301		APP_EXTRA_PROF_LIBS="$LDFLAGS $JCCL_PROF_LIBS $~~JCCL_EXTRA_LIBS $VPR_PROF_LIBS $LIBS $DTK_LDFLAGS $VPR_EXTRA_LIB~~S"
	301	APP_EXTRA_LIBS="$LDFLAGS $JCCL_LIBS $LIBS $DTK_LDFLAGS"
	302	APP_EXTRA_PROF_LIBS="$LDFLAGS $JCCL_PROF_LIBS $LIBS $DTK_LDFLAGS"
302	303
303	304	if test "x$gadget_use_x11" = "xyes" ; then
…	…
345	346	DYLIB_PROF_DEPS="$APP_EXTRA_PROF_LIBS"
346	347
	348	VJ_STRIP_DUPLICATE_ARGS([CXXFLAGS], [$CXXFLAGS])
	349	VJ_STRIP_DUPLICATE_ARGS([DEPEND_FLAGS], [$DEPEND_FLAGS])
	350	#VJ_STRIP_DUPLICATE_ARGS_REVERSE([DYLIB_DEPS], [$DYLIB_DEPS])
	351	#VJ_STRIP_DUPLICATE_ARGS_REVERSE([DYLIB_PROF_DEPS], [$DYLIB_PROF_DEPS])
	352
347	353	VJ_BUILD_LIB_FILE_LIST([$DYLIB_DEPS], [DYLIB_DEP_FILES])
348	354	VJ_BUILD_LIB_FILE_LIST([$DYLIB_PROF_DEPS], [DYLIB_PROF_DEP_FILES])
…	…
382	388	GADGET_SHARE_DIR="$data_subdir/$DATA_VERSION"
383	389
384		# Information needed to generate gadgeteer-config.
385		case $OS_TYPE in
386		UNIX)
387		if test "x$GNU_LD" = "xyes" ; then
388		static_begin="-Wl,-Bstatic"
389		static_end="-Wl,-Bdynamic"
390		gadget_ldflags_compiler="-L\$prefix/lib\$LIBBITSUF -Wl,--export-dynamic"
391		gadget_ldflags_linker="-L\$prefix/lib\$LIBBITSUF --export-dynamic"
392		else
393		static_begin="-B static"
394		static_end="