X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=4c20fe9d78ca2885f80334f9bcdec07215b6e339;hb=649c5640c86ca31f40786745638086e2823b42ee;hp=985b67138a1a492a8de039b09754942899d5de03;hpb=7b5af6595e6d20f5258fba61fadba97178d51c70;p=m17n%2Flibotf.git

diff --git a/configure.ac b/configure.ac
index 985b671..4c20fe9 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, 2006, 2007
 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.2, handa@m17n.org)
-AM_INIT_AUTOMAKE(libotf, 0.9.2)
+AC_INIT(libotf, 0.9.6, handa@m17n.org)
+AM_INIT_AUTOMAKE(libotf, 0.9.6)
 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_HEADERS([X11/Xaw/Command.h], , no_x=yes)
 
 # Checks for typedefs, structures, and compiler characteristics.
 
@@ -63,6 +65,13 @@ if test "x$HAVE_FREETYPE" != "xyes" ; then
   echo "Freetype library wan't found in your system!"
   exit 1
 fi
+AC_SUBST(FREETYPE_INC)
+AC_SUBST(FREETYPE_LD_FLAGS)
+
+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
@@ -76,5 +85,6 @@ if test "x$HAVE_ALPHASORT" = "xyes"; then
 	   [Define to 1 if you have alphasort function.])
 fi
 
-AC_CONFIG_FILES([Makefile src/Makefile example/Makefile libotf-config])
+AC_CONFIG_FILES([Makefile src/Makefile example/Makefile
+                 libotf-config libotf.pc])
 AC_OUTPUT