kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed iiimf-related ports build fail

Browse source 
Submitted by:	Masanori OZAWA <ozawa@ongs.net>
Approved by:	portmgr(krion)
Pointed out by:	pointyhat via kris
This commit is contained in:
Daichi GOTO 2005-03-25 07:59:10 +00:00
parent da254b4759
commit 698e579b67
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=131945
14 changed files with 189 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chinese/iiimf-le-newpy/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= le-newpy
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= chinese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-

30
chinese/iiimf-le-newpy/files/patch-leif_configure.ac
View file

@ -1,8 +1,28 @@
--- leif/configure.ac Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Feb 17 23:32:54 2005
@@ -61,25 +61,19 @@
IM_CONSTRUCT_FLAGS
IM_CONSTRUCT_THREAD_FLAGS
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 17:50:52 2005
@@ -44,15 +44,15 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
IM_CHECK_X
-IM_CHECK_GTK
+dnl IM_CHECK_GTK
IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,17 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \

2
chinese/iiimf-le-ude/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= le-ude
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= chinese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-

38
chinese/iiimf-le-ude/files/patch-leif_configure.ac
View file

@ -1,8 +1,30 @@
--- leif/configure.ac Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Feb 17 23:32:54 2005
@@ -61,25 +61,19 @@
IM_CONSTRUCT_FLAGS
IM_CONSTRUCT_THREAD_FLAGS
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 17:44:36 2005
@@ -44,15 +44,15 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
-IM_CHECK_X
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_X
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,15 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
@ -18,15 +40,15 @@
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
+LE_TARGETS="udt"
-
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+LE_TARGETS="udt"
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

6
japanese/iiimf-le-canna/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= le-canna
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= japanese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
@ -38,6 +38,7 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
.if !defined(WITHOUT_XAUX)
USE_XLIB= yes
USE_GNOME= gtk20
CFLAGS+= -I${X11BASE}/include
LDFLAGS+= -L${X11BASE}/lib
PLIST_SUB+= WANT_XAUX=""
@ -72,6 +73,9 @@ post-patch:
pre-configure:
@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
.if defined(WITHOUT_XAUX)
@cd ${WRKSRC} && ${REINPLACE_CMD} -e "/GTK/s,^.*$$,,g" configure.ac
.endif
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}

24
japanese/iiimf-le-canna/files/patch-leif_configure.ac
View file

@ -1,8 +1,20 @@
--- leif/configure.ac Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Fri Feb 18 01:19:12 2005
@@ -61,25 +61,19 @@
IM_CONSTRUCT_FLAGS
IM_CONSTRUCT_THREAD_FLAGS
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 18:29:16 2005
@@ -45,11 +45,11 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_FREEWNN
IM_CHECK_X
IM_CHECK_GTK
-IM_CHECK_MOTIF
+dnl IM_CHECK_MOTIF
PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
@@ -63,23 +63,17 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
@ -21,13 +33,13 @@
+LE_TARGETS="canna"
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+IM_ADD_TARGET(LE_TARGETS, HAVE_X, canna/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+IM_ADD_TARGET(LE_TARGETS, HAVE_X, canna/xaux)
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

2
japanese/iiimf-le-freewnn/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= le-freewnn
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= japanese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-

31
japanese/iiimf-le-freewnn/files/patch-leif_configure.ac
View file

@ -1,8 +1,29 @@
--- leif/configure.ac Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Fri Feb 18 01:19:12 2005
@@ -61,25 +61,18 @@
IM_CONSTRUCT_FLAGS
IM_CONSTRUCT_THREAD_FLAGS
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 18:13:32 2005
@@ -44,15 +44,15 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
+dnl IM_CHECK_CANNA
IM_CHECK_FREEWNN
-IM_CHECK_X
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_X
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,16 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \

36
korean/iiimf-le-hangul/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= le-hangul
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
CATEGORIES= korean textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
@ -21,12 +22,14 @@ IIIMF_VER= r12_1-svn2002
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= intltool
USE_XLIB= yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_LIBTOOL_VER= 15
AUTOMAKE_ARGS+= --add-missing
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
@ -41,10 +44,13 @@ IGNORE= "It is supported on FreeBSD 5.3 and later"
IGNORE= "${ARCH} is not support."
.endif
MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX"
CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
@ -52,11 +58,15 @@ post-patch:
${WRKSRC}/../lib/CSConv/csconv.h
pre-configure:
(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
(cd ${WRKSRC} && ${TOUCH} ltconfig)
do-configure:
(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
@cd ${WRKSRC} && ${REINPLACE_CMD} \
-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
${LIBTOOLFILES}
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
.include <bsd.port.post.mk>

2
korean/iiimf-le-hangul/files/patch-Makefile
View file

@ -13,7 +13,7 @@
update-acfiles:
cd acfiles && \
- $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
+ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
rm -f Makefile.in aclocal.m4
config:

93
korean/iiimf-le-hangul/files/patch-leif_autogen.sh
View file

@ -1,93 +0,0 @@
--- leif/autogen.sh Thu Dec 11 15:29:55 2003
+++ leif/autogen.sh Wed Feb 16 16:53:53 2005
@@ -6,6 +6,14 @@
DIE=0
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
ACLOCAL_FLAGS="-I ../acfiles $ACLOCAL_FLAGS"
if [ -n "$GNOME2_DIR" ]; then
@@ -22,7 +30,7 @@
exit 1
}
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`autoconf' installed."
echo "Download the appropriate package for your distribution,"
@@ -31,7 +39,7 @@
}
(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+ (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`intltool' installed."
echo "You can get it from:"
@@ -41,7 +49,7 @@
}
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
+ (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed."
echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -59,7 +67,7 @@
}
}
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`automake' installed."
echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -69,7 +77,7 @@
# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: Missing \`aclocal'. The version of \`automake'"
echo "installed doesn't appear recent enough."
@@ -114,24 +122,24 @@
fi
if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
echo "Running intltoolize..."
- intltoolize --copy --force --automake
+ ${INTLTOOLIZE} --copy --force --automake
fi
if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
- libtoolize --force --copy
+ ${LIBTOOLIZE} --force --copy
fi
fi
echo "Running aclocal $aclocalinclude ..."
- aclocal $aclocalinclude
+ ${ACLOCAL} $aclocalinclude
if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
echo "Running autoheader..."
- autoheader
+ ${AUTOHEADER}
fi
echo "Running automake --gnu $am_opt ..."
- automake --add-missing --copy --gnu $am_opt
+ ${AUTOMAKE} --add-missing --copy --gnu $am_opt
echo "Running autoconf ..."
- autoconf
+ ${AUTOCONF}
)
fi
done

41
korean/iiimf-le-hangul/files/patch-leif_configure.ac
View file

@ -1,25 +1,45 @@
--- leif/configure.ac Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Feb 17 23:32:54 2005
@@ -61,25 +61,18 @@
IM_CONSTRUCT_FLAGS
IM_CONSTRUCT_THREAD_FLAGS
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 18:06:01 2005
@@ -44,15 +44,15 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
IM_CHECK_X
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,15 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
+LE_TARGETS="hangul"
-
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
@ -27,6 +47,7 @@
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+LE_TARGETS="hangul"
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

2
textproc/iiimf-le-unit/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= le-unit
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-

31
textproc/iiimf-le-unit/files/patch-leif_configure.ac
View file

@ -1,8 +1,29 @@
--- leif/configure.ac Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Feb 17 23:32:54 2005
@@ -61,25 +61,18 @@
IM_CONSTRUCT_FLAGS
IM_CONSTRUCT_THREAD_FLAGS
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 17:47:49 2005
@@ -44,15 +44,15 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
IM_CHECK_X
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,16 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \