summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAndrey Kiselev <dron@ak4719.spb.edu>2007-02-24 15:03:47 +0000
committerAndrey Kiselev <dron@ak4719.spb.edu>2007-02-24 15:03:47 +0000
commitef833c655f3fa4409c6c62d7b52ddd267246b9ff (patch)
tree0aefc145f59f09c6276fd657b25b5c34e247193c /configure.ac
parentbddf26622c9846627c76b4bfc74b433f8db6d341 (diff)
downloadlibtiff-git-ef833c655f3fa4409c6c62d7b52ddd267246b9ff.tar.gz
Regenerated.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac27
1 files changed, 16 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index eeee3b07..1afc946f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,19 +478,9 @@ dnl Check for OpenGL and GLUT.
dnl ---------------------------------------------------------------------------
HAVE_OPENGL=no
-HAVE_XAW=no
AC_PATH_XTRA
-ICE_FIND_ATHENA
-
-if test "$no_xaw" != "yes" ; then
- HAVE_XAW=yes
-fi
-
-AM_CONDITIONAL(HAVE_XAW, test "$HAVE_XAW" = "yes")
-
-
AX_CHECK_GL
AX_CHECK_GLU
AX_CHECK_GLUT
@@ -502,6 +492,20 @@ fi
AM_CONDITIONAL(HAVE_OPENGL, test "$HAVE_OPENGL" = "yes")
+dnl ---------------------------------------------------------------------------
+dnl Check for X Athena Widgets
+dnl ---------------------------------------------------------------------------
+
+dnl HAVE_XAW=no
+
+dnl ICE_FIND_ATHENA
+
+dnl if test "$no_xaw" != "yes" ; then
+dnl HAVE_XAW=yes
+dnl fi
+
+dnl AM_CONDITIONAL(HAVE_XAW, test "$HAVE_XAW" = "yes")
+
dnl ===========================================================================
dnl ``Orthogonal Features''
dnl ===========================================================================
@@ -574,6 +578,7 @@ AC_SUBST(LIBDIR)
AC_CONFIG_HEADERS([libtiff/tif_config.h libtiff/tiffconf.h])
AC_CONFIG_FILES([Makefile \
+ build/Makefile \
contrib/Makefile \
contrib/acorn/Makefile \
contrib/addtiffo/Makefile \
@@ -629,7 +634,7 @@ LOC_MSG([ ISO JBIG support: ${HAVE_JBIG}])
LOC_MSG()
LOC_MSG([ C++ support: ${HAVE_CXX}])
LOC_MSG()
-LOC_MSG([ X Athena Widgets support: ${HAVE_XAW}])
+dnl LOC_MSG([ X Athena Widgets support: ${HAVE_XAW}])
LOC_MSG([ OpenGL support: ${HAVE_OPENGL}])
LOC_MSG()