X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure.in;h=13d9cbe9a6ad2c7c6f14dfac06c41f54be0c350b;hb=11399d8a75f72d71441a7ce83f2f95fe45b5cf69;hp=471c646466b2c9ef787f7207d2fec7b69f774817;hpb=029eebba211686ef650a612769374532a6ccb7fd;p=chise%2Fchise-base.git

diff --git a/configure.in b/configure.in
index 471c646..13d9cbe 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(chise-base, 0.23, chise-en@m17n.org)
+AC_INIT(chise-base, 0.25, chise-en@m17n.org)
 
 AC_CANONICAL_TARGET
 
@@ -13,38 +13,93 @@ AC_CANONICAL_TARGET
 #  	/usr/local/bin:/opt/bin:/sw/bin:/usr/bin:/bin)
 
 AC_SUBST(ac_configure_args)
+AC_SUBST(xemacs_configure_args)
 AC_SUBST(xemacs_site_includes)
 AC_SUBST(xemacs_site_libraries)
 AC_SUBST(xemacs_opts)
 AC_SUBST(cvs_root)
+AC_SUBST(lemi_cvs_root)
 
 if test -f CVS/Root; then
 	cvs_root=`cat CVS/Root`
+	lemi_cvs_root=`cat CVS/Root|sed 's/chise/root/'`
 else
 	cvs_root=':pserver:anonymous@cvs.m17n.org:/cvs/chise'
+	lemi_cvs_root=':pserver:anonymous@cvs.m17n.org:/cvs/root'
 fi
 
-# Checks for libraries.
+xemacs_configure_args=`echo $ac_configure_args \
+			| sed 's/--with-site-includes/--site-includes/' \
+			| sed 's/--with-site-libraries/--site-libraries/'`
+
+# Settings for optional paths
+AC_ARG_WITH(site_includes,
+  --with-site-includes=PATH List of directories to search first for header files
+,
+#xemacs_site_includes="$with_site_includes"
+,
 if test -d /sw/include; then
 	xemacs_site_includes="/sw/include"
-	xemacs_site_libraries="/sw/lib"
 	xemacs_opts="--with-dialogs=athena --with-widgets=athena --with-athena=3d"
+
+	if test -f /sw/include/db3/db.h; then
+		xemacs_site_includes="$xemacs_site_includes:/sw/include/db3"
+	elif test -f /sw/include/db4/db.h; then
+		xemacs_site_includes="$xemacs_site_includes:/sw/include/db4"
+	fi
+	if test x"$with_canna" != x"no"; then
+	   if test -d /sw/include/canna; then
+	   	xemacs_opts="$xemacs_opts --with-canna"
+	   fi
+	fi
 fi
+)
 
-if test -f /sw/include/db3/db.h; then
-	xemacs_site_includes="$xemacs_site_includes:/sw/include/db3"
-elif test -f /sw/include/db4/db.h; then
-	xemacs_site_includes="$xemacs_site_includes:/sw/include/db4"
+AC_ARG_WITH(site_libraries,
+  --with-site-libraries=PATH List of directories to search first for libraries
+,
+#xemacs_site_libraries="$with_site_libraries"
+,
+if test -d /sw/include; then
+	xemacs_site_libraries="/sw/lib"
 fi
+)
+
+AC_ARG_WITH(canna,
+  --with-canna          Support the Canna input method
+,
+#xemacs_opts="$xemacs_opts --with-canna"
+,
+)
 
-if test "$xemacs_site_includes" != ""; then
+# Checks for libraries.
+if test x"$xemacs_site_includes" != x""; then
 	xemacs_opts="$xemacs_opts --site-includes=$xemacs_site_includes"
 fi
 
-if test "$xemacs_site_libraries" != ""; then
+if test x"$xemacs_site_libraries" != x""; then
 	xemacs_opts="$xemacs_opts --site-libraries=$xemacs_site_libraries"
 fi
 
+if test x"$with_canna" != x"no"; then
+   AC_CHECK_LIB(canna,jrKanjiControl,
+   xemacs_opts="$xemacs_opts --with-canna")
+fi
+
+os_name=`uname -s`
+mac_product_name=`sw_vers |grep ProductName|cut -f2`
+mac_product_version=`sw_vers |grep ProductVersion|cut -f2`
+mac_product_major_version=`echo $mac_product_version|cut -d'.' -f1`
+mac_product_minor_version=`echo $mac_product_version|cut -d'.' -f2`
+
+if test "$os_name" = "Darwin" -a \
+   	"$mac_product_name" = "Mac OS X" -a \
+ 	$mac_product_major_version -eq 10 -a \
+     	$mac_product_minor_version -ge 7
+then
+   xemacs_opts="$xemacs_opts '--ldflags=-Wl,-no_pie'"
+fi
+
 # Checks for header files.
 
 # Checks for typedefs, structures, and compiler characteristics.