[uim-commit] r539 - trunk

[tkng at freedesktop.org]

Author: tkng
Date: 2005-02-05 00:08:49 -0800 (Sat, 05 Feb 2005)
New Revision: 539

Modified:
   trunk/Makefile.am
   trunk/configure.ac
Log:
* configure.ac: Replace AC_ARG_ENABLE with AC_ARG_WITH. Switch depends
 on external software package should use AC_ARG_WITH.


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-02-05 07:47:27 UTC (rev 538)
+++ trunk/Makefile.am	2005-02-05 08:08:49 UTC (rev 539)
@@ -4,7 +4,7 @@
 	intltool-extract.in intltool-merge.in intltool-update.in \
 	uim.pc.in ChangeLog.old uim.desktop
 
-DISTCLEANFILES = uim.pc intltool-extract\
+DISTCLEANFILES = uim.pc intltool-extract \
                  intltool-merge intltool-update po/.intltool-merge-cache
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -48,12 +48,12 @@
 
 releasetest-all-flag-enabled: RELEASETEST_CONFIGURE_FLAGS= --enable-debug \
 	 --enable-fep --enable-dict --with-m17nlib --with-canna \
-	 --with-gtk2 --with-gnome2
+	 --with-gtk2 --with-gnome2 --with-qt
 releasetest-all-flag-enabled: each-releasetest
 
 releasetest-all-flag-disabled: RELEASETEST_CONFIGURE_FLAGS= --disable-debug \
 	--disable-fep --disable-sumika	--disable-dict --without-m17nlib \
-	--without-canna --without-gtk2  --without-gnome2
+	--without-canna --without-gtk2  --without-gnome2 --without-qt
 releasetest-all-flag-disabled: each-releasetest
 
 each-releasetest:

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-02-05 07:47:27 UTC (rev 538)
+++ trunk/configure.ac	2005-02-05 08:08:49 UTC (rev 539)
@@ -245,9 +245,9 @@
 dnl ****************************
 dnl *** Check for Qt Library ***
 dnl ****************************
-AC_ARG_ENABLE(qt,
-  AC_HELP_STRING([--enable-qt],
-                 [enable qt helper applications]),
+AC_ARG_WITH(qt,
+  AC_HELP_STRING([--with-qt],
+                 [build with qt helper applications]),
   [
     case $enable_qt in
       no)
@@ -263,9 +263,9 @@
     use_qt="no"
   ])
 
-AC_ARG_ENABLE(qt-immodule,
-  AC_HELP_STRING([--enable-qt-immodule],
-                 [use qt-immodule extension]),
+AC_ARG_WITH(qt-immodule,
+  AC_HELP_STRING([--with-qt-immodule],
+                 [Build qt-immodule extension]),
   [
     case $enable_qtimmodule in
       no)