Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 417173 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (-7 / +21 lines)
Lines 125-131 if test "x$no_x" != "xyes"; then Link Here
125
  X11_LD_FLAGS="-lXt -lX11"
125
  X11_LD_FLAGS="-lXt -lX11"
126
  M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
126
  M17N_EXT_LIBS="$M17N_EXT_LIBS X11"
127
127
128
  if test "x$HAVE_XAW" = "xyes"; then
128
  AC_ARG_WITH(athena, 
129
	    AS_HELP_STRING([--with-athena],[with MIT Athena widget suport]))
130
  if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then
129
    AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
131
    AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1,
130
	      [Define to 1 if you have the Xaw header files.])
132
	      [Define to 1 if you have the Xaw header files.])
131
    XAW_LD_FLAGS="-lXaw -lXmu"
133
    XAW_LD_FLAGS="-lXaw -lXmu"
Lines 149-155 else Link Here
149
fi
151
fi
150
AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
152
AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no)
151
AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
153
AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no)
152
if test "x$HAVE_FRIBIDI" = "xyes"; then
154
AC_ARG_WITH(fribidi, 
155
	    AS_HELP_STRING([--with-fribidi],[with fribidi suport]))
156
if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then
153
  AC_DEFINE(HAVE_FRIBIDI, 1, 
157
  AC_DEFINE(HAVE_FRIBIDI, 1, 
154
	    [Define to 1 if you have Fribidi library and header file.])
158
	    [Define to 1 if you have Fribidi library and header file.])
155
  M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
159
  M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi"
Lines 202-209 fi Link Here
202
AC_SUBST(OTF_LD_FLAGS)
206
AC_SUBST(OTF_LD_FLAGS)
203
207
204
dnl Check for Freetype2 usability.
208
dnl Check for Freetype2 usability.
209
AC_ARG_WITH(freetype,
210
	    AS_HELP_STRING([--with-freetype],[enable Freetype support]))
205
AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
211
AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
206
if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
212
if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
207
  FREETYPE_INC=`freetype-config --cflags`
213
  FREETYPE_INC=`freetype-config --cflags`
208
  save_CPPFLAGS="$CPPFLAGS"
214
  save_CPPFLAGS="$CPPFLAGS"
209
  CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
215
  CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
Lines 255-261 AC_CHECK_HEADER(X11/Xft/Xft.h,, HAVE_XFT2=no, Link Here
255
#else
261
#else
256
Version too old.  Compiling this line should fail.
262
Version too old.  Compiling this line should fail.
257
#endif])
263
#endif])
258
if test "x$HAVE_XFT2" = "xyes"; then
264
AC_ARG_WITH(xft,
265
	    AS_HELP_STRING([--with-xft],[enable Xft2 support]))
266
if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then
259
  AC_DEFINE(HAVE_XFT2, 1,
267
  AC_DEFINE(HAVE_XFT2, 1,
260
	    [Define to 1 if you have Xft2 library and header file.])
268
	    [Define to 1 if you have Xft2 library and header file.])
261
  M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
269
  M17N_EXT_LIBS="$M17N_EXT_LIBS xft2"
Lines 330-336 else Link Here
330
fi
338
fi
331
AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
339
AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no)
332
AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
340
AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/)
333
if test "x$HAVE_XML2" = "xyes"; then
341
AC_ARG_WITH(libxml2, 
342
	    AS_HELP_STRING([--with-libxml2],[with libxml2 suport]))
343
if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then
334
  AC_DEFINE(HAVE_XML2, 1,
344
  AC_DEFINE(HAVE_XML2, 1,
335
	    [Define to 1 if you have libxml2 library and header file])
345
	    [Define to 1 if you have libxml2 library and header file])
336
  M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
346
  M17N_EXT_LIBS="$M17N_EXT_LIBS xml2"
Lines 344-350 AC_SUBST(XML2_LD_FLAGS) Link Here
344
dnl Check for Anthy usability.
354
dnl Check for Anthy usability.
345
355
346
PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
356
PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
347
if test "x$HAVE_ANTHY" = "xyes"; then
357
AC_ARG_WITH(anthy, 
358
	    AS_HELP_STRING([--with-anthy],[with anthy suport]))
359
if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then
348
  AC_DEFINE(HAVE_ANTHY, 1,
360
  AC_DEFINE(HAVE_ANTHY, 1,
349
	   [Define to 1 if you have Anthy library and header file])
361
	   [Define to 1 if you have Anthy library and header file])
350
  M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
362
  M17N_EXT_LIBS="$M17N_EXT_LIBS anthy"
Lines 355-361 AC_SUBST(ANTHY_LD_FLAGS) Link Here
355
367
356
dnl Check for Ispell usability.
368
dnl Check for Ispell usability.
357
AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
369
AC_CHECK_PROG(HAVE_ISPELL, ispell, yes)
358
if test "x$HAVE_ISPELL" = "xyes"; then
370
AC_ARG_WITH(ispell, 
371
	    AS_HELP_STRING([--with-ispell],[with ispell suport]))
372
if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then
359
  AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.])
373
  AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.])
360
  M17N_EXT_LIBS="$M17N_EXT_LIBS ispell"
374
  M17N_EXT_LIBS="$M17N_EXT_LIBS ispell"
361
  CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL"
375
  CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL"

Return to bug 417173