Revision: 7134
Author: nogu.dev
Date: Sat Jun 4 08:18:17 2011
Log: * Merge r7100, r7101, r7105 from trunk.
http://code.google.com/p/uim/source/detail?r=7134
Modified:
/branches/1.7/make-dist.sh
=======================================
--- /branches/1.7/make-dist.sh Tue May 10 01:19:26 2011
+++ /branches/1.7/make-dist.sh Sat Jun 4 08:18:17 2011
@@ -17,13 +17,25 @@
CONF_COMMON="$CONF_MAINT $CONF_NOWERROR"
CONF_NONE="$CONF_COMMON --disable-debug --disable-fep --disable-emacs
--disable-gnome-applet --disable-kde-applet --disable-pref --disable-dict
--without-anthy --without-canna --without-mana --without-prime
--without-skk --without-x --without-xft --without-m17nlib --without-scim
--without-gtk2 --without-qt --without-qt-immodule --disable-compat-scm
--without-eb --without-libedit"
CONF_DEFAULT="$CONF_COMMON"
+
+for file in "/etc/eb.conf" "/usr/lib64/eb.conf" "/usr/lib/eb.conf" \
+ "/usr/local/etc/eb.conf" "/usr/etc/eb.conf"
+do
+ if test -f "$file"; then
+ EB_CONF="$file"
+ break
+ fi
+done
+if test -z "$EB_CONF"; then
+ echo eb.conf not found
+ exit 1
+fi
+
# --without-scim since it is broken
# --without-qt
-# FIXME: hardcoded --with-eb-conf
-CONF_FULL_WO_MAINT="$CONF_NOWERROR --enable-debug --enable-fep
--enable-emacs --enable-gnome-applet --enable-gnome3-applet
--enable-kde-applet --enable-kde4-applet --enable-pref --enable-dict
--enable-notify --with-anthy --with-canna --with-wnn --with-sj3 --with-mana
--with-prime --with-m17nlib --without-scim --with-gtk2 --with-gtk3
--without-qt --without-qt-immodule --enable-compat-scm --with-eb
--with-eb-conf=/etc/eb.conf --with-libedit --with-qt4 --with-qt4-immodule"
+CONF_FULL_WO_MAINT="$CONF_NOWERROR --enable-debug --enable-fep
--enable-emacs --enable-gnome-applet --enable-gnome3-applet
--enable-kde-applet --enable-kde4-applet --enable-pref --enable-dict
--enable-notify --with-anthy --with-canna --with-wnn --with-sj3 --with-mana
--with-prime --with-m17nlib --without-scim --with-gtk2 --with-gtk3
--without-qt --without-qt-immodule --enable-compat-scm --with-eb
--with-eb-conf=$EB_CONF --with-libedit --with-qt4 --with-qt4-immodule"
CONF_FULL="$CONF_MAINT $CONF_FULL_WO_MAINT"
-
svn export $SSCM_URL sigscheme
svn export $LIBGCROOTS_URL sigscheme/libgcroots
(cd sigscheme/libgcroots && ./autogen.sh) \
