1.1 --- a/common/autoconf/spec.gmk.in Tue Oct 22 16:41:34 2013 -0700
1.2 +++ b/common/autoconf/spec.gmk.in Wed Oct 23 13:05:58 2013 +0200
1.3 @@ -268,13 +268,9 @@
1.4 # Number of parallel jobs to use for compilation
1.5 JOBS?=@JOBS@
1.6
1.7 -# The OpenJDK makefiles should be changed to using the standard
1.8 -# configure output ..._CFLAGS and ..._LIBS. In the meantime we
1.9 -# extract the information here.
1.10 -FREETYPE2_LIB_PATH:=@FREETYPE2_LIB_PATH@
1.11 -FREETYPE2_LIBS:=@FREETYPE2_LIBS@
1.12 -FREETYPE2_CFLAGS:=@FREETYPE2_CFLAGS@
1.13 -USING_SYSTEM_FT_LIB=@USING_SYSTEM_FT_LIB@
1.14 +FREETYPE_LIBS:=@FREETYPE_LIBS@
1.15 +FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
1.16 +FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
1.17 CUPS_CFLAGS:=@CUPS_CFLAGS@
1.18 ALSA_LIBS:=@ALSA_LIBS@
1.19 ALSA_CFLAGS:=@ALSA_CFLAGS@
