| 1 |
naota 12/07/01 01:25:44 |
| 2 |
|
| 3 |
Added: m17n-lib-1.6.3-configure.patch |
| 4 |
Log: |
| 5 |
Add patch to drop automagic dependencies. #417173 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: m17n-lib-1.6.3-configure.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.ac b/configure.ac |
| 18 |
index 2e58d68..49b812a 100644 |
| 19 |
--- a/configure.ac |
| 20 |
+++ b/configure.ac |
| 21 |
@@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then |
| 22 |
X11_LD_FLAGS="-lXt -lX11" |
| 23 |
M17N_EXT_LIBS="$M17N_EXT_LIBS X11" |
| 24 |
|
| 25 |
- if test "x$HAVE_XAW" = "xyes"; then |
| 26 |
+ AC_ARG_WITH(athena, |
| 27 |
+ AS_HELP_STRING([--with-athena],[with MIT Athena widget suport])) |
| 28 |
+ if test "x$with_athena" != "xno" -a "x$HAVE_XAW" = "xyes"; then |
| 29 |
AC_DEFINE(HAVE_X11_XAW_COMMAND_H, 1, |
| 30 |
[Define to 1 if you have the Xaw header files.]) |
| 31 |
XAW_LD_FLAGS="-lXaw -lXmu" |
| 32 |
@@ -149,7 +151,9 @@ else |
| 33 |
fi |
| 34 |
AC_CHECK_LIB(fribidi, fribidi_set_mirroring, HAVE_FRIBIDI=yes, HAVE_FRIBIDI=no) |
| 35 |
AC_CHECK_HEADER(fribidi/fribidi.h,, HAVE_FRIBIDI=no) |
| 36 |
-if test "x$HAVE_FRIBIDI" = "xyes"; then |
| 37 |
+AC_ARG_WITH(fribidi, |
| 38 |
+ AS_HELP_STRING([--with-fribidi],[with fribidi suport])) |
| 39 |
+if test "x$with_fribidi" != "xno" -a "x$HAVE_FRIBIDI" = "xyes"; then |
| 40 |
AC_DEFINE(HAVE_FRIBIDI, 1, |
| 41 |
[Define to 1 if you have Fribidi library and header file.]) |
| 42 |
M17N_EXT_LIBS="$M17N_EXT_LIBS fribidi" |
| 43 |
@@ -202,8 +206,10 @@ fi |
| 44 |
AC_SUBST(OTF_LD_FLAGS) |
| 45 |
|
| 46 |
dnl Check for Freetype2 usability. |
| 47 |
+AC_ARG_WITH(freetype, |
| 48 |
+ AS_HELP_STRING([--with-freetype],[enable Freetype support])) |
| 49 |
AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) |
| 50 |
-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then |
| 51 |
+if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then |
| 52 |
FREETYPE_INC=`freetype-config --cflags` |
| 53 |
save_CPPFLAGS="$CPPFLAGS" |
| 54 |
CPPFLAGS="$CPPFLAGS $FREETYPE_INC" |
| 55 |
@@ -255,7 +261,9 @@ AC_CHECK_HEADER(X11/Xft/Xft.h,, HAVE_XFT2=no, |
| 56 |
#else |
| 57 |
Version too old. Compiling this line should fail. |
| 58 |
#endif]) |
| 59 |
-if test "x$HAVE_XFT2" = "xyes"; then |
| 60 |
+AC_ARG_WITH(xft, |
| 61 |
+ AS_HELP_STRING([--with-xft],[enable Xft2 support])) |
| 62 |
+if test "x$with_xft" != "xno" -a "x$HAVE_XFT2" = "xyes"; then |
| 63 |
AC_DEFINE(HAVE_XFT2, 1, |
| 64 |
[Define to 1 if you have Xft2 library and header file.]) |
| 65 |
M17N_EXT_LIBS="$M17N_EXT_LIBS xft2" |
| 66 |
@@ -330,7 +338,9 @@ else |
| 67 |
fi |
| 68 |
AC_CHECK_LIB(xml2, xmlParseMemory, HAVE_XML2=yes, HAVE_XML2=no) |
| 69 |
AC_CHECK_HEADER(libxml/tree.h,, HAVE_XML2=no, /**/) |
| 70 |
-if test "x$HAVE_XML2" = "xyes"; then |
| 71 |
+AC_ARG_WITH(libxml2, |
| 72 |
+ AS_HELP_STRING([--with-libxml2],[with libxml2 suport])) |
| 73 |
+if test "x$with_libxml2" != "xno" -a "x$HAVE_XML2" = "xyes"; then |
| 74 |
AC_DEFINE(HAVE_XML2, 1, |
| 75 |
[Define to 1 if you have libxml2 library and header file]) |
| 76 |
M17N_EXT_LIBS="$M17N_EXT_LIBS xml2" |
| 77 |
@@ -344,7 +354,9 @@ AC_SUBST(XML2_LD_FLAGS) |
| 78 |
dnl Check for Anthy usability. |
| 79 |
|
| 80 |
PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no) |
| 81 |
-if test "x$HAVE_ANTHY" = "xyes"; then |
| 82 |
+AC_ARG_WITH(anthy, |
| 83 |
+ AS_HELP_STRING([--with-anthy],[with anthy suport])) |
| 84 |
+if test "x$with_anthy" != "xno" -a "x$HAVE_ANTHY" = "xyes"; then |
| 85 |
AC_DEFINE(HAVE_ANTHY, 1, |
| 86 |
[Define to 1 if you have Anthy library and header file]) |
| 87 |
M17N_EXT_LIBS="$M17N_EXT_LIBS anthy" |
| 88 |
@@ -355,7 +367,9 @@ AC_SUBST(ANTHY_LD_FLAGS) |
| 89 |
|
| 90 |
dnl Check for Ispell usability. |
| 91 |
AC_CHECK_PROG(HAVE_ISPELL, ispell, yes) |
| 92 |
-if test "x$HAVE_ISPELL" = "xyes"; then |
| 93 |
+AC_ARG_WITH(ispell, |
| 94 |
+ AS_HELP_STRING([--with-ispell],[with ispell suport])) |
| 95 |
+if test "x$with_ispell" != "xno" -a "x$HAVE_ISPELL" = "xyes"; then |
| 96 |
AC_DEFINE(HAVE_ISPELL, 1, [Define if ispell is available.]) |
| 97 |
M17N_EXT_LIBS="$M17N_EXT_LIBS ispell" |
| 98 |
CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ISPELL" |
Archives