Navigation

← Previous Changeset
Next Changeset →

Changeset 19104

Timestamp:

08/03/06 14:07:27 (2 years ago)

Author:

dshipton

Message:

Update to using flagpoll.

Files:

juggler/trunk/macros/jccl.m4 (modified) (9 diffs)

Legend:

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

juggler/trunk/macros/jccl.m4

r18824	r19104
30	30	AC_DEFUN([_JCCL_PATH_SETUP],
31	31	[
32		dnl Get the cflags and libraries from the ~~jccl-config~~ script
33		AC_ARG_WITH(jccl,
34		[ --with-jccl~~=<PATH> Directory where JCCL is~~
35		~~installed~~ [No default]],
	32	dnl Get the cflags and libraries from the flagpoll script
	33	AC_ARG_WITH(jccl-meta-file,
	34	[ --with-jccl-meta-file=<PATH> Flagpoll metadata file
	35	for JCCL [No default]],
36	36	jccl_config_prefix="$withval", jccl_config_prefix="")
37		~~AC_ARG_WITH(jccl-exec-prefix,~~
38		~~[ --with-jccl-exec-prefix=<PATH>~~
39		~~Exec prefix where JCCL is~~
40		~~installed (optional) [No default]],~~
41		~~jccl_config_exec_prefix="$withval",~~
42		~~jccl_config_exec_prefix="")~~
43	37
44		~~if test "x$jccl_config_exec_prefix" != "x" ; then~~
45		~~jccl_config_args="$jccl_config_args --exec-prefix=$jccl_config_exec_prefix"~~
46
47		~~if test x${JCCL_CONFIG+set} != xset ; then~~
48		~~JCCL_CONFIG="$jccl_config_exec_prefix/bin/jccl-config"~~
49		fi
	38	dnl See if the user specified where to find jccl
	39	dnl if they didn't take a guess for them
	40	if test "x$jccl_meta_file" != "x" ; then
	41	jccl_flagpoll_args="--from-file=$jccl_meta_file"
	42	else
	43	jccl_flagpoll_args="--from-file=$instlinks/share/flagpoll/jccl.fpc"
50	44	fi
51	45
52		if test "x$jccl_config_prefix" != "x" ; then
53		jccl_config_args="$jccl_config_args --prefix=$jccl_config_prefix"
	46	jccl_flagpoll_args="jccl $jccl_flagpoll_args --no-deps"
54	47
55		if test x${JCCL_CONFIG+set} != xset ; then
56		JCCL_CONFIG="$jccl_config_prefix/bin/jccl-config"
57		fi
58		fi
	48	AC_PATH_PROG(FLAGPOLL, flagpoll, no)
59	49
60		if test "x$JCCL_BASE_DIR" != "x" ; then
61		jccl_config_args="$jccl_config_args --prefix=$JCCL_BASE_DIR"
62
63		if test x${JCCL_CONFIG+set} != xset ; then
64		JCCL_CONFIG="$JCCL_BASE_DIR/bin/jccl-config"
65		fi
66		fi
67
68		AC_PATH_PROG(JCCL_CONFIG, jccl-config, no)
69
70		dnl Do a sanity check to ensure that $JCCL_CONFIG actually works.
71		if ! (eval $JCCL_CONFIG --cxxflags >/dev/null 2>&1) 2>&1 ; then
72		JCCL_CONFIG='no'
73		echo "*** The jccl-config script installed by JCCL could not be found"
	50	dnl Do a sanity check to ensure that $FLAGPOLL actually works.
	51	if ! (eval $FLAGPOLL --help >/dev/null 2>&1) 2>&1 ; then
	52	FLAGPOLL='no'
	53	echo "*** The flagpoll metadata file installed by JCCL could not be found"
74	54	echo "*** If JCCL was installed in PREFIX, make sure PREFIX/bin is in"
75		echo "*** your path, or set the ~~JCCL_CONFIG~~ environment variable to the"
76		echo "*** full path to ~~jccl-config~~."
	55	echo "*** your path, or set the FLAGPOLL environment variable to the"
	56	echo "*** full path to flagpoll."
77	57	fi
78	58	])
…	…
88	68	AC_REQUIRE([_JCCL_PATH_SETUP])
89	69
90		if test "x$~~JCCL_CONFIG~~" = "xno" ; then
	70	if test "x$FLAGPOLL" = "xno" ; then
91	71	ifelse([$3], , :, [$3])
92	72	else
93		JCCL_VERSION=`$~~JCCL_CONFIG --~~version`
	73	JCCL_VERSION=`$FLAGPOLL $jccl_flagpoll_args --modversion`
94	74
95	75	min_jccl_version=ifelse([$1], , 0.0.1, $1)
…	…
104	84	dnl Tests for JCCL C++ API and then defines the following variables:
105	85	dnl JCCL_CXXFLAGS
106		dnl JCCL_CXXFLAGS_MIN
107		dnl JCCL_INCLUDES
108		dnl JCCL_INCLUDES_MIN
109		dnl JCCL_LIBS_LD
110		dnl JCCL_LIBS_LD_MIN
111		dnl JCCL_LIBS_STATIC_LD
112		dnl JCCL_LIBS_STATIC_LD_MIN
113		dnl JCCL_LIBS_CC
114		dnl JCCL_LIBS_CC_MIN
115		dnl JCCL_LIBS_STATIC_CC
116		dnl JCCL_LIBS_STATIC_CC_MIN
117		dnl JCCL_PROF_LIBS_LD
118		dnl JCCL_PROF_LIBS_LD_MIN
119		dnl JCCL_PROF_LIBS_STATIC_LD
120		dnl JCCL_PROF_LIBS_STATIC_LD_MIN
121		dnl JCCL_PROF_LIBS_CC
122		dnl JCCL_PROF_LIBS_CC_MIN
123		dnl JCCL_PROF_LIBS_STATIC_CC
124		dnl JCCL_PROF_LIBS_STATIC_CC_MIN
	86	dnl JCCL_LIBS
	87	dnl JCCL_LIBS_STATIC
	88	dnl JCCL_PROF_LIBS
	89	dnl JCCL_PROF_LIBS_STATIC
125	90	dnl ---------------------------------------------------------------------------
126	91	AC_DEFUN([JCCL_PATH_CXX],
…	…
129	94
130	95	JCCL_CXXFLAGS=""
131		JCCL_CXXFLAGS_MIN=""
132		JCCL_INCLUDES=""
133		JCCL_INCLUDES_MIN=""
134		JCCL_LIBS_LD=""
135		JCCL_LIBS_LD_MIN=""
136		JCCL_LIBS_STATIC_LD=""
137		JCCL_LIBS_STATIC_LD_MIN=""
138		JCCL_LIBS_CC=""
139		JCCL_LIBS_CC_MIN=""
140		JCCL_LIBS_STATIC_CC=""
141		JCCL_LIBS_STATIC_CC_MIN=""
142		JCCL_PROF_LIBS_LD=""
143		JCCL_PROF_LIBS_LD_MIN=""
144		JCCL_PROF_LIBS_STATIC_LD=""
145		JCCL_PROF_LIBS_STATIC_LD_MIN=""
146		JCCL_PROF_LIBS_CC=""
147		JCCL_PROF_LIBS_CC_MIN=""
148		JCCL_PROF_LIBS_STATIC_CC=""
149		JCCL_PROF_LIBS_STATIC_CC_MIN=""
	96	JCCL_LIBS=""
	97	JCCL_LIBS_STATIC=""
	98	JCCL_PROF_LIBS=""
	99	JCCL_PROF_LIBS_STATIC=""
150	100
151		if test "x$~~JCCL_CONFIG~~" = "xno" ; then
	101	if test "x$FLAGPOLL" = "xno" ; then
152	102	ifelse([$3], , :, [$3])
153	103	else
154	104	AC_MSG_CHECKING([whether JCCL C++ API is available])
155		has_cxx=`$~~JCCL_CONFIG --has-cxx~~`
	105	has_cxx=`$FLAGPOLL $jccl_flagpoll_args --get-cxx-api-available`
156	106
157	107	if test "x$has_cxx" = "xY" ; then
…	…
164	114
165	115	if test "x$jccl_version_okay" = "xyes" ; then
166		JCCL_CXXFLAGS=`$JCCL_CONFIG $jccl_config_args --cxxflags $ABI`
167		JCCL_INCLUDES=`$JCCL_CONFIG $jccl_config_args --includes`
168		JCCL_EXTRA_LIBS_CC=`$JCCL_CONFIG $jccl_config_args --extra-libs $ABI`
169		JCCL_EXTRA_LIBS_LD=`$JCCL_CONFIG $jccl_config_args --extra-libs $ABI --linker`
170		JCCL_LIBS_CC=`$JCCL_CONFIG $jccl_config_args --libs $ABI`
171		JCCL_LIBS_LD=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker`
172		JCCL_PROF_LIBS_CC=`$JCCL_CONFIG $jccl_config_args --libs $ABI --profiled`
173		JCCL_PROF_LIBS_LD=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker --profiled`
174		JCCL_LIBS_STATIC_CC=`$JCCL_CONFIG $jccl_config_args --libs $ABI --static`
175		JCCL_LIBS_STATIC_LD=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker --static`
176		JCCL_PROF_LIBS_STATIC_CC=`$JCCL_CONFIG $jccl_config_args --libs $ABI --static --profiled`
177		JCCL_PROF_LIBS_STATIC_LD=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker --static --profiled`
178
179		JCCL_CXXFLAGS_MIN=`$JCCL_CONFIG $jccl_config_args --cxxflags $ABI --min`
180		JCCL_INCLUDES_MIN=`$JCCL_CONFIG $jccl_config_args --includes --min`
181		JCCL_EXTRA_LIBS_CC_MIN=`$JCCL_CONFIG $jccl_config_args --extra-libs $ABI --min`
182		JCCL_EXTRA_LIBS_LD_MIN=`$JCCL_CONFIG $jccl_config_args --extra-libs $ABI --linker --min`
183		JCCL_LIBS_CC_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --min`
184		JCCL_LIBS_LD_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker --min`
185		JCCL_LIBS_LD_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker --min`
186		JCCL_PROF_LIBS_CC_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --min --profiled`
187		JCCL_PROF_LIBS_LD_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker --min --profiled`
188		JCCL_LIBS_STATIC_CC_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --static --min`
189		JCCL_LIBS_STATIC_LD_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker --static --min`
190		JCCL_PROF_LIBS_STATIC_CC_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --static --min --profiled`
191		JCCL_PROF_LIBS_STATIC_LD_MIN=`$JCCL_CONFIG $jccl_config_args --libs $ABI --linker --static --min --profiled`
	116	JCCL_CXXFLAGS=`$FLAGPOLL $jccl_flagpoll_args --cflags `
	117	JCCL_LIBS=`$FLAGPOLL $jccl_flagpoll_args --get-libs`
	118	JCCL_EXTRA_LIBS=`$FLAGPOLL $jccl_flagpoll_args --get-extra-libs`
	119	JCCL_PROF_LIBS=`$FLAGPOLL $jccl_flagpoll_args --get-profiled-libs`
	120	JCCL_LIBS_STATIC=`$FLAGPOLL $jccl_flagpoll_args --get-static-libs`
	121	JCCL_PROF_LIBS_STATIC=`$FLAGPOLL $jccl_flagpoll_args --get-profiled-static-libs`
192	122
193	123	ifelse([$2], , :, [$2])
…	…
200	130
201	131	AC_SUBST([JCCL_CXXFLAGS])
202		AC_SUBST([JCCL_LIBS_CC])
203		AC_SUBST([JCCL_LIBS_LD])
204		AC_SUBST([JCCL_PROF_LIBS_CC])
205		AC_SUBST([JCCL_PROF_LIBS_LD])
206		AC_SUBST([JCCL_LIBS_STATIC_LD])
207		AC_SUBST([JCCL_LIBS_STATIC_CC])
208		AC_SUBST([JCCL_PROF_LIBS_STATIC_LD])
209		AC_SUBST([JCCL_PROF_LIBS_STATIC_CC])
210		AC_SUBST([JCCL_EXTRA_LIBS_CC])
211		AC_SUBST([JCCL_EXTRA_LIBS_LD])
212
213		AC_SUBST([JCCL_CXXFLAGS_MIN])
214		AC_SUBST([JCCL_INCLUDES_MIN])
215		AC_SUBST([JCCL_LIBS_CC_MIN])
216		AC_SUBST([JCCL_LIBS_LD_MIN])
217		AC_SUBST([JCCL_PROF_LIBS_CC_MIN])
218		AC_SUBST([JCCL_PROF_LIBS_LD_MIN])
219		AC_SUBST([JCCL_LIBS_STATIC_CC_MIN])
220		AC_SUBST([JCCL_LIBS_STATIC_LD_MIN])
221		AC_SUBST([JCCL_PROF_LIBS_STATIC_CC_MIN])
222		AC_SUBST([JCCL_PROF_LIBS_STATIC_LD_MIN])
	132	AC_SUBST([JCCL_LIBS])
	133	AC_SUBST([JCCL_PROF_LIBS])
	134	AC_SUBST([JCCL_LIBS_STATIC])
	135	AC_SUBST([JCCL_PROF_LIBS_STATIC])
	136	AC_SUBST([JCCL_EXTRA_LIBS])
223	137	])
224	138
…	…
235	149	JCCL_JARS=''
236	150
237		if test "x$~~JCCL_CONFIG~~" = "xno" ; then
	151	if test "x$FLAGPOLL" = "xno" ; then
238	152	ifelse([$3], , :, [$3])
239	153	else
240	154	AC_MSG_CHECKING([whether JCCL Java API is available])
241		has_java=`$~~JCCL_CONFIG --has-java~~`
	155	has_java=`$FLAGPOLL $jccl_flagpoll_args --get-java-api-available`
242	156
243	157	if test "x$has_java" = "xY" ; then
…	…
250	164
251	165	if test "x$jccl_version_okay" = "xyes" ; then
252		JCCL_JARS="`$~~JCCL_CONFIG $jccl_config_args -~~-jars`"
	166	JCCL_JARS="`$FLAGPOLL $jccl_flagpoll_args --get-jars`"
253	167
254	168	ifelse([$2], , :, [$2])
…	…
269	183	dnl variables:
270	184	dnl JCCL_CXXFLAGS
271		dnl JCCL_CXXFLAGS_MIN
272		dnl JCCL_LIBS_LD
273		dnl JCCL_LIBS_LD_MIN
274		dnl JCCL_LIBS_STATIC_LD
275		dnl JCCL_LIBS_STATIC_LD_MIN
276		dnl JCCL_LIBS_CC
277		dnl JCCL_LIBS_CC_MIN
278		dnl JCCL_LIBS_STATIC_CC
279		dnl JCCL_LIBS_STATIC_CC_MIN
280		dnl JCCL_PROF_LIBS_LD
281		dnl JCCL_PROF_LIBS_LD_MIN
282		dnl JCCL_PROF_LIBS_STATIC_LD
283		dnl JCCL_PROF_LIBS_STATIC_LD_MIN
284		dnl JCCL_PROF_LIBS_CC
285		dnl JCCL_PROF_LIBS_CC_MIN
286		dnl JCCL_PROF_LIBS_STATIC_CC
287		dnl JCCL_PROF_LIBS_STATIC_CC_MIN
	185	dnl JCCL_LIBS
	186	dnl JCCL_LIBS_STATIC
	187	dnl JCCL_PROF_LIBS
	188	dnl JCCL_PROF_LIBS_STATIC
288	189	dnl JCCL_JARS
289	190	dnl ---------------------------------------------------------------------------

Navigation

Changeset 19104

Legend:

juggler/trunk/macros/jccl.m4

Download in other formats: