diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rwxr-xr-x | configure | 1279 | ||||
| -rw-r--r-- | configure.ac | 89 | ||||
| -rw-r--r-- | contrib/addtiffo/Makefile | 26 | ||||
| -rw-r--r-- | libtiff/tif_unix.c | 19 | ||||
| -rw-r--r-- | libtiff/tiffconf.h | 8 | ||||
| -rw-r--r-- | tools/Makefile.am | 48 | ||||
| -rw-r--r-- | tools/Makefile.in | 97 |
9 files changed, 1182 insertions, 396 deletions
diff --git a/Makefile.am b/Makefile.am index 6cd4aa14..4fba281b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -# $Id: Makefile.am,v 1.3 2004-03-28 11:25:13 dron Exp $ -# # Tag Image File Format (TIFF) Software # # Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org> @@ -35,5 +33,5 @@ EXTRA_DIST = \ VERSION \ autogen.sh -SUBDIRS = html libtiff man tools +SUBDIRS = libtiff tools contrib man html diff --git a/Makefile.in b/Makefile.in index b13a93d6..780c6a3b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.50 2004-03-28 11:25:13 dron Exp $ +# $Id: Makefile.in,v 1.51 2004-03-30 10:15:05 dron Exp $ # # Tag Image File Format (TIFF) Software # @@ -126,6 +126,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@ +HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -133,7 +135,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTIFF = @LIBTIFF@ LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@ LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@ LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@ @@ -143,6 +144,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ +OPENGL_LIBS = @OPENGL_LIBS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -206,7 +208,7 @@ EXTRA_DIST = \ VERSION \ autogen.sh -SUBDIRS = html libtiff man tools +SUBDIRS = libtiff tools contrib man html all: all-recursive .SUFFIXES: @@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LIBTIFF LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE OPENGL_LIBS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1044,6 +1044,7 @@ Optional Features: --enable-old-jpeg enable support for Old JPEG compresson (read contrib/ojpeg/README first! Compilation fails with unpatched IJG JPEG library) + --disable-opengl disable building OpenGL viewer (enabled by default) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1053,14 +1054,27 @@ Optional Packages: both] --with-tags[=TAGS] include additional configurations [automatic] - --with-zlib-inc=ARG location of Zlib headers (specify, if not in + --with-zlib-include-dir=DIR + location of Zlib headers (specify, if not in standard place) - --with-zlib-lib=ARG location of Zlib library binary (specify, if not in + --with-zlib-lib-dir=DIR location of Zlib library binary (specify, if not in standard place) - --with-jpeg-inc=ARG location of IJG JPEG library headers (specify, if + --with-jpeg-include-dir=DIR + location of IJG JPEG library headers (specify, if not in standard place) - --with-jpeg-lib=ARG location of IJG JPEG library binary (specify, if not + --with-jpeg-lib-dir=DIR location of IJG JPEG library binary (specify, if not in standard place) + --with-opengl-include-dir=DIR + location of OpenGL library headers (specify, if not + in standard place) + --with-opengl-lib-dir=DIR + location of OpenGL library binary (specify, if not + in standard place) + --with-glut-include-dir=DIR + location of GLUT library headers (specify, if not in + standard place) + --with-glut-lib-dir=DIR location of GLUT library binary (specify, if not in + standard place) Some influential environment variables: CC C compiler command @@ -3656,7 +3670,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3659 "configure"' > conftest.$ac_ext + echo '#line 3673 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5215,7 +5229,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5218:" \ +echo "$as_me:5232:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6247,11 +6261,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6250: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6264: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6254: \$? = $ac_status" >&5 + echo "$as_me:6268: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6480,11 +6494,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6483: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6497: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6487: \$? = $ac_status" >&5 + echo "$as_me:6501: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6540,11 +6554,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6543: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6557: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6547: \$? = $ac_status" >&5 + echo "$as_me:6561: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8715,7 +8729,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8718 "configure" +#line 8732 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8813,7 +8827,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8816 "configure" +#line 8830 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10990,11 +11004,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10993: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11007: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10997: \$? = $ac_status" >&5 + echo "$as_me:11011: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11050,11 +11064,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11053: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11067: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11057: \$? = $ac_status" >&5 + echo "$as_me:11071: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12404,7 +12418,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12407 "configure" +#line 12421 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12502,7 +12516,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12505 "configure" +#line 12519 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13329,11 +13343,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13332: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13346: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13336: \$? = $ac_status" >&5 + echo "$as_me:13350: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13389,11 +13403,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13392: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13406: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13396: \$? = $ac_status" >&5 + echo "$as_me:13410: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15421,11 +15435,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15424: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15438: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15428: \$? = $ac_status" >&5 + echo "$as_me:15442: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15654,11 +15668,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15657: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15671: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15661: \$? = $ac_status" >&5 + echo "$as_me:15675: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15714,11 +15728,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15717: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15731: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15721: \$? = $ac_status" >&5 + echo "$as_me:15735: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17889,7 +17903,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 17892 "configure" +#line 17906 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17987,7 +18001,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 17990 "configure" +#line 18004 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20000,73 +20014,6 @@ fi -echo "$as_me:$LINENO: checking for main in -lGL" >&5 -echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 -if test "${ac_cv_lib_GL_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGL $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_GL_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_GL_main=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_main" >&6 -if test $ac_cv_lib_GL_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGL 1 -_ACEOF - - LIBS="-lGL $LIBS" - -fi - - echo "$as_me:$LINENO: checking for main in -lc" >&5 echo $ECHO_N "checking for main in -lc... $ECHO_C" >&6 if test "${ac_cv_lib_c_main+set}" = set; then @@ -20134,140 +20081,6 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for main in -lgl" >&5 -echo $ECHO_N "checking for main in -lgl... $ECHO_C" >&6 -if test "${ac_cv_lib_gl_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gl_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_gl_main=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_gl_main" >&5 -echo "${ECHO_T}$ac_cv_lib_gl_main" >&6 -if test $ac_cv_lib_gl_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGL 1 -_ACEOF - - LIBS="-lgl $LIBS" - -fi - - -echo "$as_me:$LINENO: checking for main in -lglut" >&5 -echo $ECHO_N "checking for main in -lglut... $ECHO_C" >&6 -if test "${ac_cv_lib_glut_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lglut $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_glut_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_glut_main=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_glut_main" >&5 -echo "${ECHO_T}$ac_cv_lib_glut_main" >&6 -if test $ac_cv_lib_glut_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGLUT 1 -_ACEOF - - LIBS="-lglut $LIBS" - -fi - - case "$target_os" in cygwin* | mingw32* | beos* | darwin*) ;; @@ -23124,15 +22937,15 @@ if test "${enable_zlib+set}" = set; then fi; -# Check whether --with-zlib-inc or --without-zlib-inc was given. -if test "${with_zlib_inc+set}" = set; then - withval="$with_zlib_inc" +# Check whether --with-zlib-include-dir or --without-zlib-include-dir was given. +if test "${with_zlib_include_dir+set}" = set; then + withval="$with_zlib_include_dir" fi; -# Check whether --with-zlib-lib or --without-zlib-lib was given. -if test "${with_zlib_lib+set}" = set; then - withval="$with_zlib_lib" +# Check whether --with-zlib-lib-dir or --without-zlib-lib-dir was given. +if test "${with_zlib_lib_dir+set}" = set; then + withval="$with_zlib_lib_dir" fi; @@ -23280,8 +23093,8 @@ else fi if test "$zlib_lib" = "no" ; then - { { echo "$as_me:$LINENO: error: Zlib library not found in $with_zlib_lib" >&5 -echo "$as_me: error: Zlib library not found in $with_zlib_lib" >&2;} + { { echo "$as_me:$LINENO: error: Zlib library not found at $with_zlib_lib" >&5 +echo "$as_me: error: Zlib library not found at $with_zlib_lib" >&2;} { (exit 1); exit 1; }; } fi fi @@ -23576,8 +23389,8 @@ fi if test "$zlib_h" = "no" ; then - { { echo "$as_me:$LINENO: error: Zlib headers not found in $with_zlib_h" >&5 -echo "$as_me: error: Zlib headers not found in $with_zlib_h" >&2;} + { { echo "$as_me:$LINENO: error: Zlib headers not found at $with_zlib_h" >&5 +echo "$as_me: error: Zlib headers not found at $with_zlib_h" >&2;} { (exit 1); exit 1; }; } fi fi @@ -23602,15 +23415,15 @@ if test "${enable_jpeg+set}" = set; then fi; -# Check whether --with-jpeg-inc or --without-jpeg-inc was given. -if test "${with_jpeg_inc+set}" = set; then - withval="$with_jpeg_inc" +# Check whether --with-jpeg-include-dir or --without-jpeg-include-dir was given. +if test "${with_jpeg_include_dir+set}" = set; then + withval="$with_jpeg_include_dir" fi; -# Check whether --with-jpeg-lib or --without-jpeg-lib was given. -if test "${with_jpeg_lib+set}" = set; then - withval="$with_jpeg_lib" +# Check whether --with-jpeg-lib-dir or --without-jpeg-lib-dir was given. +if test "${with_jpeg_lib_dir+set}" = set; then + withval="$with_jpeg_lib_dir" fi; @@ -23758,8 +23571,8 @@ else fi if test "$jpeg_lib" = "no" ; then - { { echo "$as_me:$LINENO: error: IJG JPEG library not found in $with_jpeg_lib" >&5 -echo "$as_me: error: IJG JPEG library not found in $with_jpeg_lib" >&2;} + { { echo "$as_me:$LINENO: error: IJG JPEG library not found at $with_jpeg_lib" >&5 +echo "$as_me: error: IJG JPEG library not found at $with_jpeg_lib" >&2;} { (exit 1); exit 1; }; } fi fi @@ -24054,8 +23867,8 @@ fi if test "$jpeg_h" = "no" ; then - { { echo "$as_me:$LINENO: error: IJG JPEG library headers not found in $with_jpeg_h" >&5 -echo "$as_me: error: IJG JPEG library headers not found in $with_jpeg_h" >&2;} + { { echo "$as_me:$LINENO: error: IJG JPEG library headers not found at $with_jpeg_h" >&5 +echo "$as_me: error: IJG JPEG library headers not found at $with_jpeg_h" >&2;} { (exit 1); exit 1; }; } fi fi @@ -24087,10 +23900,951 @@ if test "$HAVE_JPEG" = "yes" -a "$HAVE_OJPEG" = "yes" ; then fi -LIBTIFF=../libtiff/libtiff.la +HAVE_OPENGL=no +OPENGL_LIBS="" +# Check whether --enable-opengl or --disable-opengl was given. +if test "${enable_opengl+set}" = set; then + enableval="$enable_opengl" + +fi; + +# Check whether --with-opengl-include-dir or --without-opengl-include-dir was given. +if test "${with_opengl_include_dir+set}" = set; then + withval="$with_opengl_include_dir" + +fi; - ac_config_files="$ac_config_files Makefile html/Makefile html/images/Makefile html/man/Makefile libtiff/Makefile man/Makefile port/Makefile tools/Makefile" +# Check whether --with-opengl-lib-dir or --without-opengl-lib-dir was given. +if test "${with_opengl_lib_dir+set}" = set; then + withval="$with_opengl_lib_dir" + +fi; + +# Check whether --with-glut-include-dir or --without-glut-include-dir was given. +if test "${with_glut_include_dir+set}" = set; then + withval="$with_glut_include_dir" + +fi; + +# Check whether --with-glut-lib-dir or --without-glut-lib-dir was given. +if test "${with_glut_lib_dir+set}" = set; then + withval="$with_glut_lib_dir" + +fi; + +if test "x$enable_opengl" != "xno" ; then + + if test "x$with_opengl_lib" = "xyes" ; then + echo "$as_me:$LINENO: checking for glDrawPixels in -lGL" >&5 +echo $ECHO_N "checking for glDrawPixels in -lGL... $ECHO_C" >&6 +if test "${ac_cv_lib_GL_glDrawPixels+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGL $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char glDrawPixels (); +int +main () +{ +glDrawPixels (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_GL_glDrawPixels=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_GL_glDrawPixels=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glDrawPixels" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_glDrawPixels" >&6 +if test $ac_cv_lib_GL_glDrawPixels = yes; then + opengl_lib=yes +else + opengl_lib=no +fi + + elif test "x$with_opengl_lib" != "xno" ; then + LIBS="$with_opengl_lib $LIBS" + echo "$as_me:$LINENO: checking for glDrawPixels in -lGL" >&5 +echo $ECHO_N "checking for glDrawPixels in -lGL... $ECHO_C" >&6 +if test "${ac_cv_lib_GL_glDrawPixels+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lGL $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char glDrawPixels (); +int +main () +{ +glDrawPixels (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_GL_glDrawPixels=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_GL_glDrawPixels=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glDrawPixels" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_glDrawPixels" >&6 +if test $ac_cv_lib_GL_glDrawPixels = yes; then + opengl_lib=yes +else + opengl_lib=no +fi + + if test "$opengl_lib" = "no" ; then + { { echo "$as_me:$LINENO: error: OpenGL library not found at $with_opengl_lib" >&5 +echo "$as_me: error: OpenGL library not found at $with_opengl_lib" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + if test "x$with_opengl_h" = "xyes" ; then + if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 +echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <GL/gl.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 +echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <GL/gl.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------- ## +## Report this to tiff@remotesensing.org ## +## ------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_GL_gl_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 + +fi +if test $ac_cv_header_GL_gl_h = yes; then + opengl_h=yes +else + opengl_h=no +fi + + + elif test "x$with_opengl_h" != "xno" ; then + INCLUDE="$with_opengl_h $INCLUDE" + if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 +echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <GL/gl.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 +echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <GL/gl.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------- ## +## Report this to tiff@remotesensing.org ## +## ------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_GL_gl_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 + +fi +if test $ac_cv_header_GL_gl_h = yes; then + opengl_h=yes +else + opengl_h=no +fi + + + if test "$opengl_h" = "no" ; then + { { echo "$as_me:$LINENO: error: OpenGL library headers not found at $with_opengl_h" >&5 +echo "$as_me: error: OpenGL library headers not found at $with_opengl_h" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + if test "x$with_glut_lib" = "xyes" ; then + echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 +echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 +if test "${ac_cv_lib_glut_glutInit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lglut $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char glutInit (); +int +main () +{ +glutInit (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_glut_glutInit=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_glut_glutInit=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutInit" >&5 +echo "${ECHO_T}$ac_cv_lib_glut_glutInit" >&6 +if test $ac_cv_lib_glut_glutInit = yes; then + glut_lib=yes +else + glut_lib=no +fi + + elif test "x$with_glut_lib" != "xno" ; then + LIBS="$with_glut_lib $LIBS" + echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 +echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 +if test "${ac_cv_lib_glut_glutInit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lglut $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char glutInit (); +int +main () +{ +glutInit (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_glut_glutInit=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_glut_glutInit=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutInit" >&5 +echo "${ECHO_T}$ac_cv_lib_glut_glutInit" >&6 +if test $ac_cv_lib_glut_glutInit = yes; then + glut_lib=yes +else + glut_lib=no +fi + + if test "$glut_lib" = "no" ; then + { { echo "$as_me:$LINENO: error: GLUT library not found at $with_glut_lib" >&5 +echo "$as_me: error: GLUT library not found at $with_glut_lib" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + if test "x$with_glut_h" = "xyes" ; then + if test "${ac_cv_header_GL_glut_h+set}" = set; then + echo "$as_me:$LINENO: checking for GL/glut.h" >&5 +echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_glut_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking GL/glut.h usability" >&5 +echo $ECHO_N "checking GL/glut.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <GL/glut.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking GL/glut.h presence" >&5 +echo $ECHO_N "checking GL/glut.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <GL/glut.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/glut.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: GL/glut.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: GL/glut.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/glut.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/glut.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/glut.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/glut.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------- ## +## Report this to tiff@remotesensing.org ## +## ------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for GL/glut.h" >&5 +echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_glut_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_GL_glut_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6 + +fi +if test $ac_cv_header_GL_glut_h = yes; then + glut_h=yes +else + glut_h=no +fi + + + elif test "x$with_glut_h" != "xno" ; then + INCLUDE="$with_glut_h $INCLUDE" + if test "${ac_cv_header_GL_glut_h+set}" = set; then + echo "$as_me:$LINENO: checking for GL/glut.h" >&5 +echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_glut_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking GL/glut.h usability" >&5 +echo $ECHO_N "checking GL/glut.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <GL/glut.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking GL/glut.h presence" >&5 +echo $ECHO_N "checking GL/glut.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <GL/glut.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: GL/glut.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/glut.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: GL/glut.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: GL/glut.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/glut.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/glut.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/glut.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: GL/glut.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/glut.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/glut.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------- ## +## Report this to tiff@remotesensing.org ## +## ------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for GL/glut.h" >&5 +echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_glut_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_GL_glut_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6 + +fi +if test $ac_cv_header_GL_glut_h = yes; then + glut_h=yes +else + glut_h=no +fi + + + if test "$glut_h" = "no" ; then + { { echo "$as_me:$LINENO: error: GLUT library headers not found at $with_glut_h" >&5 +echo "$as_me: error: GLUT library headers not found at $with_glut_h" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + if test "$opengl_lib" = "yes" -a "$opengl_h" = "yes" \ + -a "$glut_lib" = "yes" -a "$glut_h" = "yes" ; then + HAVE_OPENGL=yes + OPENGL_LIBS="-lGL -lglut" + fi + +fi + + + +if test "$HAVE_OPENGL" = "yes"; then + HAVE_OPENGL_TRUE= + HAVE_OPENGL_FALSE='#' +else + HAVE_OPENGL_TRUE='#' + HAVE_OPENGL_FALSE= +fi + + + + + ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/addtiffo/Makefile html/Makefile html/images/Makefile html/man/Makefile libtiff/Makefile man/Makefile port/Makefile tools/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -24211,6 +24965,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_OPENGL_TRUE}" && test -z "${HAVE_OPENGL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_OPENGL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_OPENGL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -24656,6 +25417,8 @@ do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; + "contrib/addtiffo/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/addtiffo/Makefile" ;; "html/Makefile" ) CONFIG_FILES="$CONFIG_FILES html/Makefile" ;; "html/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES html/images/Makefile" ;; "html/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES html/man/Makefile" ;; @@ -24818,7 +25581,9 @@ s,@FFLAGS@,$FFLAGS,;t t s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@LIBOBJS@,$LIBOBJS,;t t -s,@LIBTIFF@,$LIBTIFF,;t t +s,@HAVE_OPENGL_TRUE@,$HAVE_OPENGL_TRUE,;t t +s,@HAVE_OPENGL_FALSE@,$HAVE_OPENGL_FALSE,;t t +s,@OPENGL_LIBS@,$OPENGL_LIBS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/configure.ac b/configure.ac index 4322fe5a..56356c34 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,4 @@ dnl -*- Autoconf -*- -dnl $Id: configure.ac,v 1.4 2004-03-29 11:31:45 dron Exp $ -dnl dnl Tag Image File Format (TIFF) Software dnl dnl Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org> @@ -51,10 +49,7 @@ AC_PROG_LN_S AC_PROG_RANLIB dnl Checks for libraries. -AC_CHECK_LIB([GL], [main]) AC_CHECK_LIB([c], [main]) -AC_CHECK_LIB([gl], [main]) -AC_CHECK_LIB([glut], [main]) dnl We don't need to add math library at all targets case "$target_os" in @@ -96,8 +91,8 @@ dnl --------------------------------------------------------------------------- HAVE_ZLIB=no AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [disable Zlib usage (required for Deflate compression, enabled by default)]),,) -AC_ARG_WITH(zlib-inc,AS_HELP_STRING([--with-zlib-inc=ARG], [location of Zlib headers (specify, if not in standard place)]),,) -AC_ARG_WITH(zlib-lib,AS_HELP_STRING([--with-zlib-lib=ARG], [location of Zlib library binary (specify, if not in standard place)]),,) +AC_ARG_WITH(zlib-include-dir, AS_HELP_STRING([--with-zlib-include-dir=DIR], [location of Zlib headers (specify, if not in standard place)]),,) +AC_ARG_WITH(zlib-lib-dir, AS_HELP_STRING([--with-zlib-lib-dir=DIR], [location of Zlib library binary (specify, if not in standard place)]),,) if test "x$enable_zlib" != "xno" ; then @@ -107,7 +102,7 @@ if test "x$enable_zlib" != "xno" ; then LIBS="$with_zlib_lib $LIBS" AC_CHECK_LIB(z, inflateEnd, [zlib_lib=yes], [zlib_lib=no],) if test "$zlib_lib" = "no" ; then - AC_MSG_ERROR([Zlib library not found in $with_zlib_lib]) + AC_MSG_ERROR([Zlib library not found at $with_zlib_lib]) fi fi @@ -117,7 +112,7 @@ if test "x$enable_zlib" != "xno" ; then INCLUDE="$with_zlib_h $INCLUDE" AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no]) if test "$zlib_h" = "no" ; then - AC_MSG_ERROR([Zlib headers not found in $with_zlib_h]) + AC_MSG_ERROR([Zlib headers not found at $with_zlib_h]) fi fi @@ -139,8 +134,8 @@ dnl --------------------------------------------------------------------------- HAVE_JPEG=no AC_ARG_ENABLE(jpeg, AS_HELP_STRING([--disable-jpeg], [disable IJG JPEG library usage (required for JPEG compression, enabled by default)]),,) -AC_ARG_WITH(jpeg-inc,AS_HELP_STRING([--with-jpeg-inc=ARG], [location of IJG JPEG library headers (specify, if not in standard place)]),,) -AC_ARG_WITH(jpeg-lib,AS_HELP_STRING([--with-jpeg-lib=ARG], [location of IJG JPEG library binary (specify, if not in standard place)]),,) +AC_ARG_WITH(jpeg-include-dir, AS_HELP_STRING([--with-jpeg-include-dir=DIR], [location of IJG JPEG library headers (specify, if not in standard place)]),,) +AC_ARG_WITH(jpeg-lib-dir, AS_HELP_STRING([--with-jpeg-lib-dir=DIR], [location of IJG JPEG library binary (specify, if not in standard place)]),,) if test "x$enable_jpeg" != "xno" ; then @@ -150,7 +145,7 @@ if test "x$enable_jpeg" != "xno" ; then LIBS="$with_jpeg_lib $LIBS" AC_CHECK_LIB(jpeg, jpeg_read_scanlines, [jpeg_lib=yes], [jpeg_lib=no],) if test "$jpeg_lib" = "no" ; then - AC_MSG_ERROR([IJG JPEG library not found in $with_jpeg_lib]) + AC_MSG_ERROR([IJG JPEG library not found at $with_jpeg_lib]) fi fi @@ -160,7 +155,7 @@ if test "x$enable_jpeg" != "xno" ; then INCLUDE="$with_jpeg_h $INCLUDE" AC_CHECK_HEADER(jpeglib.h, [jpeg_h=yes], [jpeg_h=no]) if test "$jpeg_h" = "no" ; then - AC_MSG_ERROR([IJG JPEG library headers not found in $with_jpeg_h]) + AC_MSG_ERROR([IJG JPEG library headers not found at $with_jpeg_h]) fi fi @@ -188,10 +183,76 @@ if test "$HAVE_JPEG" = "yes" -a "$HAVE_OJPEG" = "yes" ; then fi dnl --------------------------------------------------------------------------- +dnl Check for OpenGL and GLUT. +dnl --------------------------------------------------------------------------- + +HAVE_OPENGL=no +OPENGL_LIBS="" + +AC_ARG_ENABLE(opengl, AS_HELP_STRING([--disable-opengl], [disable building OpenGL viewer (enabled by default)]),,) +AC_ARG_WITH(opengl-include-dir, AS_HELP_STRING([--with-opengl-include-dir=DIR], [location of OpenGL library headers (specify, if not in standard place)]),,) +AC_ARG_WITH(opengl-lib-dir,AS_HELP_STRING([--with-opengl-lib-dir=DIR], [location of OpenGL library binary (specify, if not in standard place)]),,) +AC_ARG_WITH(glut-include-dir, AS_HELP_STRING([--with-glut-include-dir=DIR], [location of GLUT library headers (specify, if not in standard place)]),,) +AC_ARG_WITH(glut-lib-dir, AS_HELP_STRING([--with-glut-lib-dir=DIR], [location of GLUT library binary (specify, if not in standard place)]),,) + +if test "x$enable_opengl" != "xno" ; then + + if test "x$with_opengl_lib" = "xyes" ; then + AC_CHECK_LIB(GL, glDrawPixels, [opengl_lib=yes], [opengl_lib=no],) + elif test "x$with_opengl_lib" != "xno" ; then + LIBS="$with_opengl_lib $LIBS" + AC_CHECK_LIB(GL, glDrawPixels, [opengl_lib=yes], [opengl_lib=no],) + if test "$opengl_lib" = "no" ; then + AC_MSG_ERROR([OpenGL library not found at $with_opengl_lib]) + fi + fi + + if test "x$with_opengl_h" = "xyes" ; then + AC_CHECK_HEADER(GL/gl.h, [opengl_h=yes], [opengl_h=no]) + elif test "x$with_opengl_h" != "xno" ; then + INCLUDE="$with_opengl_h $INCLUDE" + AC_CHECK_HEADER(GL/gl.h, [opengl_h=yes], [opengl_h=no]) + if test "$opengl_h" = "no" ; then + AC_MSG_ERROR([OpenGL library headers not found at $with_opengl_h]) + fi + fi -AC_SUBST(LIBTIFF,../libtiff/libtiff.la) + if test "x$with_glut_lib" = "xyes" ; then + AC_CHECK_LIB(glut, glutInit, [glut_lib=yes], [glut_lib=no],) + elif test "x$with_glut_lib" != "xno" ; then + LIBS="$with_glut_lib $LIBS" + AC_CHECK_LIB(glut, glutInit, [glut_lib=yes], [glut_lib=no],) + if test "$glut_lib" = "no" ; then + AC_MSG_ERROR([GLUT library not found at $with_glut_lib]) + fi + fi + + if test "x$with_glut_h" = "xyes" ; then + AC_CHECK_HEADER(GL/glut.h, [glut_h=yes], [glut_h=no]) + elif test "x$with_glut_h" != "xno" ; then + INCLUDE="$with_glut_h $INCLUDE" + AC_CHECK_HEADER(GL/glut.h, [glut_h=yes], [glut_h=no]) + if test "$glut_h" = "no" ; then + AC_MSG_ERROR([GLUT library headers not found at $with_glut_h]) + fi + fi + + if test "$opengl_lib" = "yes" -a "$opengl_h" = "yes" \ + -a "$glut_lib" = "yes" -a "$glut_h" = "yes" ; then + HAVE_OPENGL=yes + OPENGL_LIBS="-lGL -lglut" + fi + +fi + +AM_CONDITIONAL(HAVE_OPENGL, test "$HAVE_OPENGL" = "yes") +AC_SUBST(OPENGL_LIBS) + +dnl --------------------------------------------------------------------------- AC_CONFIG_FILES([Makefile \ + contrib/Makefile \ + contrib/addtiffo/Makefile \ html/Makefile \ html/images/Makefile \ html/man/Makefile \ diff --git a/contrib/addtiffo/Makefile b/contrib/addtiffo/Makefile deleted file mode 100644 index df725e64..00000000 --- a/contrib/addtiffo/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# -# If libtiff.a is installed in /usr/lib or /usr/local/lib just point -# LIBTIFF_DIR there. It doesn't need a full libtiff tree. -# -LIBTIFF_DIR = ../../libtiff -# -CC = gcc -CFLAGS = -O -I$(LIBTIFF_DIR) -LIBS = $(LIBTIFF_DIR)/libtiff.a -lm - -addtiffo: addtiffo.o tif_overview.o tif_ovrcache.o - $(CXX) $(CFLAGS) addtiffo.o tif_overview.o tif_ovrcache.o \ - $(LIBS) -o addtiffo - - -addtiffo.o: addtiffo.c - $(CC) -c $(CFLAGS) addtiffo.c - -tif_overview.o: tif_overview.c - $(CC) -c $(CFLAGS) tif_overview.c - -tif_ovrcache.o: tif_ovrcache.c - $(CC) -c $(CFLAGS) tif_ovrcache.c - -clean: - rm *.o addtiffo diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c index 5ae9f1b2..a3265f8f 100644 --- a/libtiff/tif_unix.c +++ b/libtiff/tif_unix.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_unix.c,v 1.5 2004-01-29 19:54:14 dron Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_unix.c,v 1.6 2004-03-30 10:18:47 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -28,6 +28,7 @@ * TIFF Library UNIX-specific Routines. */ #include "tiffiop.h" +#include <sys/stat.h> #include <sys/types.h> #include <unistd.h> #include <stdlib.h> @@ -47,11 +48,7 @@ _tiffWriteProc(thandle_t fd, tdata_t buf, tsize_t size) static toff_t _tiffSeekProc(thandle_t fd, toff_t off, int whence) { -#if USE_64BIT_API == 1 - return ((toff_t) lseek64((int) fd, (off64_t) off, whence)); -#else return ((toff_t) lseek((int) fd, (off_t) off, whence)); -#endif } static int @@ -60,7 +57,6 @@ _tiffCloseProc(thandle_t fd) return (close((int) fd)); } -#include <sys/stat.h> static toff_t _tiffSizeProc(thandle_t fd) @@ -69,14 +65,9 @@ _tiffSizeProc(thandle_t fd) long fsize; return ((fsize = lseek((int) fd, 0, SEEK_END)) < 0 ? 0 : fsize); #else -#if USE_64BIT_API == 1 - struct stat64 sb; - return (toff_t) (fstat64((int) fd, &sb) < 0 ? 0 : sb.st_size); -#else struct stat sb; return (toff_t) (fstat((int) fd, &sb) < 0 ? 0 : sb.st_size); #endif -#endif } #ifdef HAVE_MMAP @@ -150,7 +141,7 @@ TIFFOpen(const char* name, const char* mode) if (m == -1) return ((TIFF*)0); -/* for cygwin */ +/* for cygwin and mingw */ #ifdef O_BINARY m |= O_BINARY; #endif @@ -158,12 +149,8 @@ TIFFOpen(const char* name, const char* mode) #ifdef _AM29K fd = open(name, m); #else -#if USE_64BIT_API == 1 - fd = open(name, m | O_LARGEFILE, 0666); -#else fd = open(name, m, 0666); #endif -#endif if (fd < 0) { TIFFError(module, "%s: Cannot open", name); return ((TIFF *)0); diff --git a/libtiff/tiffconf.h b/libtiff/tiffconf.h index 083239a8..d30dbda4 100644 --- a/libtiff/tiffconf.h +++ b/libtiff/tiffconf.h @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffconf.h,v 1.10 2004-03-26 14:57:52 dron Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffconf.h,v 1.11 2004-03-30 10:18:13 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. @@ -48,8 +48,6 @@ * HOST_FILLORDER native cpu bit order: one of FILLORDER_MSB2LSB * or FILLODER_LSB2MSB; this is typically set by the * configure script - * USE_64BIT_API set to 1 if tif_unix.c should use lseek64(), - * fstat64() and stat64 allowing 2-4GB files. */ #ifndef HAVE_IEEEFP #define HAVE_IEEEFP 1 @@ -58,10 +56,6 @@ #define HOST_FILLORDER FILLORDER_MSB2LSB #endif -#ifndef USE_64BIT_API -# define USE_64BIT_API 0 -#endif - #ifndef COMPRESSION_SUPPORT /* * Compression support defines: diff --git a/tools/Makefile.am b/tools/Makefile.am index 19e559c5..42d1c053 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,5 +1,3 @@ -# $Id: Makefile.am,v 1.3 2004-03-29 11:32:20 dron Exp $ -# # Tag Image File Format (TIFF) Software # # Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org> @@ -25,6 +23,8 @@ # Process this file with automake to produce Makefile.in. +LIBTIFF = $(top_srcdir)/libtiff/libtiff.la + if HAVE_OPENGL BIN_TIFFGT = tiffgt else @@ -58,49 +58,49 @@ bin_PROGRAMS = \ EXTRA_PROGRAMS = $(BIN_TIFFGT) sgi2tiff sgisv ycbcr fax2ps_SOURCES = fax2ps.c -fax2ps_LDADD = @LIBTIFF@ +fax2ps_LDADD = $(LIBTIFF) fax2tiff_SOURCES = fax2tiff.c -fax2tiff_LDADD = @LIBTIFF@ +fax2tiff_LDADD = $(LIBTIFF) gif2tiff_SOURCES = gif2tiff.c -gif2tiff_LDADD = @LIBTIFF@ +gif2tiff_LDADD = $(LIBTIFF) pal2rgb_SOURCES = pal2rgb.c -pal2rgb_LDADD = @LIBTIFF@ +pal2rgb_LDADD = $(LIBTIFF) ppm2tiff_SOURCES = ppm2tiff.c -ppm2tiff_LDADD = @LIBTIFF@ +ppm2tiff_LDADD = $(LIBTIFF) ras2tiff_SOURCES = ras2tiff.c -ras2tiff_LDADD = @LIBTIFF@ +ras2tiff_LDADD = $(LIBTIFF) raw2tiff_SOURCES = raw2tiff.c -raw2tiff_LDADD = @LIBTIFF@ +raw2tiff_LDADD = $(LIBTIFF) rgb2ycbcr_SOURCES = rgb2ycbcr.c -rgb2ycbcr_LDADD = @LIBTIFF@ +rgb2ycbcr_LDADD = $(LIBTIFF) thumbnail_SOURCES = thumbnail.c -thumbnail_LDADD = @LIBTIFF@ +thumbnail_LDADD = $(LIBTIFF) tiff2bw_SOURCES = tiff2bw.c -tiff2bw_LDADD = @LIBTIFF@ +tiff2bw_LDADD = $(LIBTIFF) tiff2pdf_SOURCES = tiff2pdf.c -tiff2pdf_LDADD = @LIBTIFF@ +tiff2pdf_LDADD = $(LIBTIFF) tiff2ps_SOURCES = tiff2ps.c -tiff2ps_LDADD = @LIBTIFF@ +tiff2ps_LDADD = $(LIBTIFF) tiff2rgba_SOURCES = tiff2rgba.c -tiff2rgba_LDADD = @LIBTIFF@ +tiff2rgba_LDADD = $(LIBTIFF) tiffcmp_SOURCES = tiffcmp.c -tiffcmp_LDADD = @LIBTIFF@ +tiffcmp_LDADD = $(LIBTIFF) tiffcp_SOURCES = tiffcp.c -tiffcp_LDADD = @LIBTIFF@ +tiffcp_LDADD = $(LIBTIFF) tiffdither_SOURCES = tiffdither.c -tiffdither_LDADD = @LIBTIFF@ +tiffdither_LDADD = $(LIBTIFF) tiffdump_SOURCES = tiffdump.c -tiffdump_LDADD = @LIBTIFF@ +tiffdump_LDADD = $(LIBTIFF) tiffinfo_SOURCES = tiffinfo.c -tiffinfo_LDADD = @LIBTIFF@ +tiffinfo_LDADD = $(LIBTIFF) tiffmedian_SOURCES = tiffmedian.c -tiffmedian_LDADD = @LIBTIFF@ +tiffmedian_LDADD = $(LIBTIFF) tiffset_SOURCES = tiffset.c -tiffset_LDADD = @LIBTIFF@ +tiffset_LDADD = $(LIBTIFF) tiffsplit_SOURCES = tiffsplit.c -tiffsplit_LDADD = @LIBTIFF@ +tiffsplit_LDADD = $(LIBTIFF) tiffgt_SOURCES = tiffgt.c -tiffgt_LDADD = @LIBTIFF@ +tiffgt_LDADD = $(LIBTIFF) $(OPENGL_LIBS) INCLUDES = -I$(top_srcdir)/libtiff diff --git a/tools/Makefile.in b/tools/Makefile.in index ff90bf69..c8923918 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.17 2004-03-29 11:32:20 dron Exp $ +# $Id: Makefile.in,v 1.18 2004-03-30 10:14:28 dron Exp $ # # Tag Image File Format (TIFF) Software # @@ -89,28 +89,29 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_fax2ps_OBJECTS = fax2ps.$(OBJEXT) fax2ps_OBJECTS = $(am_fax2ps_OBJECTS) -fax2ps_DEPENDENCIES = +am__DEPENDENCIES_1 = $(top_srcdir)/libtiff/libtiff.la +fax2ps_DEPENDENCIES = $(am__DEPENDENCIES_1) am_fax2tiff_OBJECTS = fax2tiff.$(OBJEXT) fax2tiff_OBJECTS = $(am_fax2tiff_OBJECTS) -fax2tiff_DEPENDENCIES = +fax2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) am_gif2tiff_OBJECTS = gif2tiff.$(OBJEXT) gif2tiff_OBJECTS = $(am_gif2tiff_OBJECTS) -gif2tiff_DEPENDENCIES = +gif2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) am_pal2rgb_OBJECTS = pal2rgb.$(OBJEXT) pal2rgb_OBJECTS = $(am_pal2rgb_OBJECTS) -pal2rgb_DEPENDENCIES = +pal2rgb_DEPENDENCIES = $(am__DEPENDENCIES_1) am_ppm2tiff_OBJECTS = ppm2tiff.$(OBJEXT) ppm2tiff_OBJECTS = $(am_ppm2tiff_OBJECTS) -ppm2tiff_DEPENDENCIES = +ppm2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) am_ras2tiff_OBJECTS = ras2tiff.$(OBJEXT) ras2tiff_OBJECTS = $(am_ras2tiff_OBJECTS) -ras2tiff_DEPENDENCIES = +ras2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) am_raw2tiff_OBJECTS = raw2tiff.$(OBJEXT) raw2tiff_OBJECTS = $(am_raw2tiff_OBJECTS) -raw2tiff_DEPENDENCIES = +raw2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) am_rgb2ycbcr_OBJECTS = rgb2ycbcr.$(OBJEXT) rgb2ycbcr_OBJECTS = $(am_rgb2ycbcr_OBJECTS) -rgb2ycbcr_DEPENDENCIES = +rgb2ycbcr_DEPENDENCIES = $(am__DEPENDENCIES_1) sgi2tiff_SOURCES = sgi2tiff.c sgi2tiff_OBJECTS = sgi2tiff.$(OBJEXT) sgi2tiff_LDADD = $(LDADD) @@ -119,46 +120,47 @@ sgisv_OBJECTS = sgisv.$(OBJEXT) sgisv_LDADD = $(LDADD) am_thumbnail_OBJECTS = thumbnail.$(OBJEXT) thumbnail_OBJECTS = $(am_thumbnail_OBJECTS) -thumbnail_DEPENDENCIES = +thumbnail_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiff2bw_OBJECTS = tiff2bw.$(OBJEXT) tiff2bw_OBJECTS = $(am_tiff2bw_OBJECTS) -tiff2bw_DEPENDENCIES = +tiff2bw_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiff2pdf_OBJECTS = tiff2pdf.$(OBJEXT) tiff2pdf_OBJECTS = $(am_tiff2pdf_OBJECTS) -tiff2pdf_DEPENDENCIES = +tiff2pdf_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiff2ps_OBJECTS = tiff2ps.$(OBJEXT) tiff2ps_OBJECTS = $(am_tiff2ps_OBJECTS) -tiff2ps_DEPENDENCIES = +tiff2ps_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiff2rgba_OBJECTS = tiff2rgba.$(OBJEXT) tiff2rgba_OBJECTS = $(am_tiff2rgba_OBJECTS) -tiff2rgba_DEPENDENCIES = +tiff2rgba_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiffcmp_OBJECTS = tiffcmp.$(OBJEXT) tiffcmp_OBJECTS = $(am_tiffcmp_OBJECTS) -tiffcmp_DEPENDENCIES = +tiffcmp_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiffcp_OBJECTS = tiffcp.$(OBJEXT) tiffcp_OBJECTS = $(am_tiffcp_OBJECTS) -tiffcp_DEPENDENCIES = +tiffcp_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiffdither_OBJECTS = tiffdither.$(OBJEXT) tiffdither_OBJECTS = $(am_tiffdither_OBJECTS) -tiffdither_DEPENDENCIES = +tiffdither_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiffdump_OBJECTS = tiffdump.$(OBJEXT) tiffdump_OBJECTS = $(am_tiffdump_OBJECTS) -tiffdump_DEPENDENCIES = +tiffdump_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiffgt_OBJECTS = tiffgt.$(OBJEXT) tiffgt_OBJECTS = $(am_tiffgt_OBJECTS) -tiffgt_DEPENDENCIES = +am__DEPENDENCIES_2 = +tiffgt_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am_tiffinfo_OBJECTS = tiffinfo.$(OBJEXT) tiffinfo_OBJECTS = $(am_tiffinfo_OBJECTS) -tiffinfo_DEPENDENCIES = +tiffinfo_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiffmedian_OBJECTS = tiffmedian.$(OBJEXT) tiffmedian_OBJECTS = $(am_tiffmedian_OBJECTS) -tiffmedian_DEPENDENCIES = +tiffmedian_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiffset_OBJECTS = tiffset.$(OBJEXT) tiffset_OBJECTS = $(am_tiffset_OBJECTS) -tiffset_DEPENDENCIES = +tiffset_DEPENDENCIES = $(am__DEPENDENCIES_1) am_tiffsplit_OBJECTS = tiffsplit.$(OBJEXT) tiffsplit_OBJECTS = $(am_tiffsplit_OBJECTS) -tiffsplit_DEPENDENCIES = +tiffsplit_DEPENDENCIES = $(am__DEPENDENCIES_1) ycbcr_SOURCES = ycbcr.c ycbcr_OBJECTS = ycbcr.$(OBJEXT) ycbcr_LDADD = $(LDADD) @@ -235,6 +237,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@ +HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -242,7 +246,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBTIFF = @LIBTIFF@ LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@ LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@ LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@ @@ -252,6 +255,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ OBJEXT = @OBJEXT@ +OPENGL_LIBS = @OPENGL_LIBS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -305,52 +309,53 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +LIBTIFF = $(top_srcdir)/libtiff/libtiff.la @HAVE_OPENGL_FALSE@BIN_TIFFGT = @HAVE_OPENGL_TRUE@BIN_TIFFGT = tiffgt fax2ps_SOURCES = fax2ps.c -fax2ps_LDADD = @LIBTIFF@ +fax2ps_LDADD = $(LIBTIFF) fax2tiff_SOURCES = fax2tiff.c -fax2tiff_LDADD = @LIBTIFF@ +fax2tiff_LDADD = $(LIBTIFF) gif2tiff_SOURCES = gif2tiff.c -gif2tiff_LDADD = @LIBTIFF@ +gif2tiff_LDADD = $(LIBTIFF) pal2rgb_SOURCES = pal2rgb.c -pal2rgb_LDADD = @LIBTIFF@ +pal2rgb_LDADD = $(LIBTIFF) ppm2tiff_SOURCES = ppm2tiff.c -ppm2tiff_LDADD = @LIBTIFF@ +ppm2tiff_LDADD = $(LIBTIFF) ras2tiff_SOURCES = ras2tiff.c -ras2tiff_LDADD = @LIBTIFF@ +ras2tiff_LDADD = $(LIBTIFF) raw2tiff_SOURCES = raw2tiff.c -raw2tiff_LDADD = @LIBTIFF@ +raw2tiff_LDADD = $(LIBTIFF) rgb2ycbcr_SOURCES = rgb2ycbcr.c -rgb2ycbcr_LDADD = @LIBTIFF@ +rgb2ycbcr_LDADD = $(LIBTIFF) thumbnail_SOURCES = thumbnail.c -thumbnail_LDADD = @LIBTIFF@ +thumbnail_LDADD = $(LIBTIFF) tiff2bw_SOURCES = tiff2bw.c -tiff2bw_LDADD = @LIBTIFF@ +tiff2bw_LDADD = $(LIBTIFF) tiff2pdf_SOURCES = tiff2pdf.c -tiff2pdf_LDADD = @LIBTIFF@ +tiff2pdf_LDADD = $(LIBTIFF) tiff2ps_SOURCES = tiff2ps.c -tiff2ps_LDADD = @LIBTIFF@ +tiff2ps_LDADD = $(LIBTIFF) tiff2rgba_SOURCES = tiff2rgba.c -tiff2rgba_LDADD = @LIBTIFF@ +tiff2rgba_LDADD = $(LIBTIFF) tiffcmp_SOURCES = tiffcmp.c -tiffcmp_LDADD = @LIBTIFF@ +tiffcmp_LDADD = $(LIBTIFF) tiffcp_SOURCES = tiffcp.c -tiffcp_LDADD = @LIBTIFF@ +tiffcp_LDADD = $(LIBTIFF) tiffdither_SOURCES = tiffdither.c -tiffdither_LDADD = @LIBTIFF@ +tiffdither_LDADD = $(LIBTIFF) tiffdump_SOURCES = tiffdump.c -tiffdump_LDADD = @LIBTIFF@ +tiffdump_LDADD = $(LIBTIFF) tiffinfo_SOURCES = tiffinfo.c -tiffinfo_LDADD = @LIBTIFF@ +tiffinfo_LDADD = $(LIBTIFF) tiffmedian_SOURCES = tiffmedian.c -tiffmedian_LDADD = @LIBTIFF@ +tiffmedian_LDADD = $(LIBTIFF) tiffset_SOURCES = tiffset.c -tiffset_LDADD = @LIBTIFF@ +tiffset_LDADD = $(LIBTIFF) tiffsplit_SOURCES = tiffsplit.c -tiffsplit_LDADD = @LIBTIFF@ +tiffsplit_LDADD = $(LIBTIFF) tiffgt_SOURCES = tiffgt.c -tiffgt_LDADD = @LIBTIFF@ +tiffgt_LDADD = $(LIBTIFF) $(OPENGL_LIBS) INCLUDES = -I$(top_srcdir)/libtiff all: all-am |