From: handa <handa>
Date: Fri, 2 Sep 2005 12:27:50 +0000 (+0000)
Subject: (AC_INIT): Version updated to 0.9.4.
X-Git-Tag: REL-0-9-5~46
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e059c63fa9891216326fd0d4e320851418d25c8;p=m17n%2Flibotf.git

(AC_INIT): Version updated to 0.9.4.
(AM_INIT_AUTOMAKE): Likewise.
(X11_XT_XAW_XMU): New variable.  Set to a library list for Xaw if
X11 is available.
---

diff --git a/configure.ac b/configure.ac
index 2e25214..5e82c4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Autoconf script for libotf.
 
 dnl Process this file with autoconf to produce a configure script.
 
-dnl Copyright (C) 2003, 2004
+dnl Copyright (C) 2003, 2004, 2005
 dnl   National Institute of Advanced Industrial Science and Technology (AIST)
 dnl   Registration Number H15PRO167
 
@@ -23,8 +23,8 @@ dnl License along with this library, in a file named COPYING; if not,
 dnl write to the Free Software Foundation, Inc., 59 Temple Place, Suite
 dnl 330, Boston, MA 02111-1307, USA.
 
-AC_INIT(libotf, 0.9.3, handa@m17n.org)
-AM_INIT_AUTOMAKE(libotf, 0.9.3)
+AC_INIT(libotf, 0.9.4, handa@m17n.org)
+AM_INIT_AUTOMAKE(libotf, 0.9.4)
 AM_CONFIG_HEADER(src/config.h)
 
 # Checks for programs.
@@ -36,7 +36,9 @@ AC_PATH_XTRA
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h X11/Xaw/Command.h])
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
+
+AC_CHECK_HEADER(X11/Xaw/Command.h, , no_x=yes)
 
 # Checks for typedefs, structures, and compiler characteristics.
 
@@ -64,6 +66,11 @@ if test "x$HAVE_FREETYPE" != "xyes" ; then
   exit 1
 fi
 
+if test "x$no_x" != "xyes"; then
+  X11_XT_XAW_XMU="-lX11 -lXt -lXaw -lXmu"
+fi
+AC_SUBST(X11_XT_XAW_XMU)
+
 AC_CHECK_FUNC(scandir, HAVE_SCANDIR=yes, HAVE_SCANDIR=no)
 if test "x$HAVE_SCANDIR" = "xyes"; then
   AC_DEFINE(HAVE_SCANDIR, 1,