Attachment #392612 for bug #528022

View | Details | Raw Unified | Return to bug 528022
Collapse All | Expand All




# with usually. Many applications will want to add $(ICULIBS_I18N) as well. 
ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) 

# Proper echo newline handling is needed in icu-config
ECHO_N=@ICU_ECHO_N@
ECHO_C=@ICU_ECHO_C@
# Not currently being used but good to have for proper tab handling
ECHO_T=@ICU_ECHO_T@

##################################################################
##################################################################
#




	    ;;

	--cflags)
	    printf "%s" "${CFLAGS}"
	    ;;

	--cc)
	    printf "%s" "${CC}"
	    ;;

	--cxx)
	    printf "%s" "${CXX}"
	    ;;

	--cxxflags)
	    printf "%s" "${CXXFLAGS}"
	    ;;

	--cppflags)
	    # Don't echo the -I. - it's unneeded.
	    printf "%s" "${CPPFLAGS}" | sed -e 's/-I. //'
	    ;;

	--cppflags-searchpath)
	    printf "%s" "-I${prefix}/include"
	    ;;

	--cppflags-dynamic)
	    printf "%s" "${SHAREDLIBCPPFLAGS}"
	    ;;

	--cxxflags-dynamic)
	    printf "%s" "${SHAREDLIBCXXFLAGS}"
	    ;;

	--cflags-dynamic)
	    printf "%s" "${SHAREDLIBCFLAGS}"
	    ;;

	--ldflags-system)
	    printf "%s" "${LIBS}"
	    ;;

	--ldflags)
	    printf "%s" "${LDFLAGS} ${ICULIBS}"
# $RPATH_LDFLAGS
	    ;;

	--ldflags-libsonly)
	    printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}"
	    ;;

	--ldflags-icuio)
	    printf "%s" " ${ICULIBS_ICUIO}"
	    ;;

	--ldflags-obsolete)
	    printf "%s" "${ICULIBS_OBSOLETE}"
	    ;;

	--ldflags-toolutil)
	    printf "%s" " ${ICULIBS_TOOLUTIL}"
	    ;;

	--ldflags-layout)
	    printf "%s" "${ICULIBS_LAYOUT} ${ICULIBS_LAYOUTEX}"
	    ;;

	--ldflags-searchpath)
	    printf "%s" "-L${libdir}"
	    ;;

	--detect-prefix)

	    ;;

	--shared-datadir)
	    printf "%s" "${datadir}"
	    ;;

        --incfile)
	    printf "%s" "${pkglibdir}/Makefile.inc"
	    ;;

	--incpkgdatafile)
	    printf "%s" "${pkglibdir}/pkgdata.inc"
	    ;;

	--icudata)
	    printf "%s" "${ICUDATA_NAME}"
	    ;;

	--icudata-mode)
	    printf "%s" "${PKGDATA_MODE}"
	    ;;

	--icudata-install-dir)
        printf "%s" "${ICUPKGDATA_DIR}"
	    ;;

	--icudatadir)
	    printf "%s" "${ICUDATA_DIR}"
	    ;;

	--shlib-c)
	    printf "%s" "${SHLIB_c}"
	    ;;

	--shlib-cc)
	    printf "%s" "${SHLIB_cc}"
	    ;;

	--version)
	    printf "%s" "$VERSION"
	    ;;

	--unicode-version)
	    printf "%s" "$UNICODE_VERSION"
	    ;;

	--host)




PACKAGE="icu"
AC_SUBST(PACKAGE)

# Use custom echo test for newline option
# Current autoconf (2.65) gives incorrect echo newline option
# for icu-config
# This may be removed later - mow (June 17, 2010)
ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
case `/bin/sh -c "echo -n x"` in
-n*)
  case `/bin/sh -c "echo 'x\c'"` in
  *c*) ICU_ECHO_T=' ';;     # ECHO_T is single tab character.
  *)   ICU_ECHO_C='\c';;
  esac;;
*)
  ICU_ECHO_N='-n';;
esac
AC_SUBST(ICU_ECHO_N)
AC_SUBST(ICU_ECHO_C)
AC_SUBST(ICU_ECHO_T)

AC_MSG_CHECKING(for ICU version numbers)

# Get the ICU version from uversion.h or other headers

Lines 155-165 Link Here

(-)icudefs.mk.in (-5 lines)
155	ENABLE_STATIC = @ENABLE_STATIC@	155	ENABLE_STATIC = @ENABLE_STATIC@
156	ENABLE_SHARED = @ENABLE_SHARED@	156	ENABLE_SHARED = @ENABLE_SHARED@
157		157
158	# Echo w/o newline
159
160	#ECHO_N = @ICU_ECHO_N@
161	#ECHO_C = @ICU_ECHO_C@
162
163	# Commands to compile	158	# Commands to compile
164	COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c	159	COMPILE.c= $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c
165	COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c	160	COMPILE.cc= $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c

Lines 33-41 Link Here

(-)test/hdrtst/Makefile.in (-3 lines)
33	include $(shell icu-config --incfile)	33	include $(shell icu-config --incfile)
34	DIRS=$(prefix)/include/unicode	34	DIRS=$(prefix)/include/unicode
35	LDIRS=$(prefix)/include/layout	35	LDIRS=$(prefix)/include/layout
36	ECHO_T=@ECHO_T@
37	ECHO_C=@ECHO_C@
38	ECHO_N=@ECHO_N@
39		36
40	all:	37	all:
41	@echo Please read this Makefile for more information.	38	@echo Please read this Makefile for more information.

Return to bug 528022

Lines 125-136 Link Here

(-)config/Makefile.inc.in (-6 lines)
125	# with usually. Many applications will want to add $(ICULIBS_I18N) as well.	125	# with usually. Many applications will want to add $(ICULIBS_I18N) as well.
126	ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA)	126	ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA)
127		127
128	# Proper echo newline handling is needed in icu-config
129	ECHO_N=@ICU_ECHO_N@
130	ECHO_C=@ICU_ECHO_C@
131	# Not currently being used but good to have for proper tab handling
132	ECHO_T=@ICU_ECHO_T@
133
134	##################################################################	128	##################################################################
135	##################################################################	129	##################################################################
136	#	130	#

Lines 217-289 Link Here

(-)config/icu-config-bottom (-28 / +28 lines)
217	;;	217	;;
218		218
219	--cflags)	219	--cflags)
220	echo $ECHO_N "${CFLAGS} ${ECHO_C}"	220	printf "%s" "${CFLAGS}"
221	;;	221	;;
222		222
223	--cc)	223	--cc)
224	echo $ECHO_N "${CC} ${ECHO_C}"	224	printf "%s" "${CC}"
225	;;	225	;;
226		226
227	--cxx)	227	--cxx)
228	echo $ECHO_N "${CXX} ${ECHO_C}"	228	printf "%s" "${CXX}"
229	;;	229	;;
230		230
231	--cxxflags)	231	--cxxflags)
232	echo $ECHO_N "${CXXFLAGS} ${ECHO_C}"	232	printf "%s" "${CXXFLAGS}"
233	;;	233	;;
234		234
235	--cppflags)	235	--cppflags)
236	# Don't echo the -I. - it's unneeded.	236	# Don't echo the -I. - it's unneeded.
237	echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" \| sed -e 's/-I. //'	237	printf "%s" "${CPPFLAGS}" \| sed -e 's/-I. //'
238	;;	238	;;
239		239
240	--cppflags-searchpath)	240	--cppflags-searchpath)
241	echo $ECHO_N "-I${prefix}/include ${ECHO_C}"	241	printf "%s" "-I${prefix}/include"
242	;;	242	;;
243		243
244	--cppflags-dynamic)	244	--cppflags-dynamic)
245	echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}"	245	printf "%s" "${SHAREDLIBCPPFLAGS}"
246	;;	246	;;
247		247
248	--cxxflags-dynamic)	248	--cxxflags-dynamic)
249	echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}"	249	printf "%s" "${SHAREDLIBCXXFLAGS}"
250	;;	250	;;
251		251
252	--cflags-dynamic)	252	--cflags-dynamic)
253	echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}"	253	printf "%s" "${SHAREDLIBCFLAGS}"
254	;;	254	;;
255		255
256	--ldflags-system)	256	--ldflags-system)
257	echo $ECHO_N "${LIBS} ${ECHO_C}"	257	printf "%s" "${LIBS}"
258	;;	258	;;
259		259
260	--ldflags)	260	--ldflags)
261	echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}"	261	printf "%s" "${LDFLAGS} ${ICULIBS}"
262	# $RPATH_LDFLAGS	262	# $RPATH_LDFLAGS
263	;;	263	;;
264		264
265	--ldflags-libsonly)	265	--ldflags-libsonly)
266	echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}"	266	printf "%s" "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}"
267	;;	267	;;
268		268
269	--ldflags-icuio)	269	--ldflags-icuio)
270	echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"	270	printf "%s" " ${ICULIBS_ICUIO}"
271	;;	271	;;
272		272
273	--ldflags-obsolete)	273	--ldflags-obsolete)
274	echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"	274	printf "%s" "${ICULIBS_OBSOLETE}"
275	;;	275	;;
276		276
277	--ldflags-toolutil)	277	--ldflags-toolutil)
278	echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"	278	printf "%s" " ${ICULIBS_TOOLUTIL}"
279	;;	279	;;
280		280
281	--ldflags-layout)	281	--ldflags-layout)
282	echo $ECHO_N "${ICULIBS_LAYOUT} ${ICULIBS_LAYOUTEX} ${ECHO_C}"	282	printf "%s" "${ICULIBS_LAYOUT} ${ICULIBS_LAYOUTEX}"
283	;;	283	;;
284		284
285	--ldflags-searchpath)	285	--ldflags-searchpath)
286	echo $ECHO_N "-L${libdir} ${ECHO_C}"	286	printf "%s" "-L${libdir}"
287	;;	287	;;
288		288
289	--detect-prefix)	289	--detect-prefix)
Lines 319-365 Link Here
319	;;	319	;;
320		320
321	--shared-datadir)	321	--shared-datadir)
322	echo $ECHO_N "${datadir} ${ECHO_C}"	322	printf "%s" "${datadir}"
323	;;	323	;;
324		324
325	--incfile)	325	--incfile)
326	echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}"	326	printf "%s" "${pkglibdir}/Makefile.inc"
327	;;	327	;;
328		328
329	--incpkgdatafile)	329	--incpkgdatafile)
330	echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}"	330	printf "%s" "${pkglibdir}/pkgdata.inc"
331	;;	331	;;
332		332
333	--icudata)	333	--icudata)
334	echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}"	334	printf "%s" "${ICUDATA_NAME}"
335	;;	335	;;
336		336
337	--icudata-mode)	337	--icudata-mode)
338	echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}"	338	printf "%s" "${PKGDATA_MODE}"
339	;;	339	;;
340		340
341	--icudata-install-dir)	341	--icudata-install-dir)
342	echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}"	342	printf "%s" "${ICUPKGDATA_DIR}"
343	;;	343	;;
344		344
345	--icudatadir)	345	--icudatadir)
346	echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}"	346	printf "%s" "${ICUDATA_DIR}"
347	;;	347	;;
348		348
349	--shlib-c)	349	--shlib-c)
350	echo $ECHO_N "${SHLIB_c} ${ECHO_C}"	350	printf "%s" "${SHLIB_c}"
351	;;	351	;;
352		352
353	--shlib-cc)	353	--shlib-cc)
354	echo $ECHO_N "${SHLIB_cc} ${ECHO_C}"	354	printf "%s" "${SHLIB_cc}"
355	;;	355	;;
356		356
357	--version)	357	--version)
358	echo $ECHO_N $VERSION	358	printf "%s" "$VERSION"
359	;;	359	;;
360		360
361	--unicode-version)	361	--unicode-version)
362	echo $ECHO_N $UNICODE_VERSION	362	printf "%s" "$UNICODE_VERSION"
363	;;	363	;;
364		364
365	--host)	365	--host)

Lines 19-42 Link Here

(-)configure.ac (-18 lines)
19	PACKAGE="icu"	19	PACKAGE="icu"
20	AC_SUBST(PACKAGE)	20	AC_SUBST(PACKAGE)
21		21
22	# Use custom echo test for newline option
23	# Current autoconf (2.65) gives incorrect echo newline option
24	# for icu-config
25	# This may be removed later - mow (June 17, 2010)
26	ICU_ECHO_C= ICU_ECHO_N= ICU_ECHO_T=
27	case `/bin/sh -c "echo -n x"` in
28	-n*)
29	case `/bin/sh -c "echo 'x\c'"` in
30	c) ICU_ECHO_T=' ';; # ECHO_T is single tab character.
31	*) ICU_ECHO_C='\c';;
32	esac;;
33	*)
34	ICU_ECHO_N='-n';;
35	esac
36	AC_SUBST(ICU_ECHO_N)
37	AC_SUBST(ICU_ECHO_C)
38	AC_SUBST(ICU_ECHO_T)
39
40	AC_MSG_CHECKING(for ICU version numbers)	22	AC_MSG_CHECKING(for ICU version numbers)
41		23
42	# Get the ICU version from uversion.h or other headers	24	# Get the ICU version from uversion.h or other headers