diff options
| -rw-r--r-- | tkimg/gif/Makefile.in | 1 | ||||
| -rwxr-xr-x | tkimg/gif/configure | 72 | ||||
| -rw-r--r-- | tkimg/gif/configure.in | 3 | ||||
| -rw-r--r-- | tkimg/gif/tkimggifConfig.sh.in | 26 | ||||
| -rw-r--r-- | tkimg/jpeg/Makefile.in | 1 | ||||
| -rwxr-xr-x | tkimg/jpeg/configure | 72 | ||||
| -rw-r--r-- | tkimg/jpeg/configure.in | 3 | ||||
| -rw-r--r-- | tkimg/jpeg/tkimgjpegConfig.sh.in | 26 | ||||
| -rw-r--r-- | tkimg/png/Makefile.in | 1 | ||||
| -rwxr-xr-x | tkimg/png/configure | 72 | ||||
| -rw-r--r-- | tkimg/png/configure.in | 3 | ||||
| -rw-r--r-- | tkimg/png/tkimgpngConfig.sh.in | 26 | ||||
| -rw-r--r-- | tkimg/tiff/Makefile.in | 1 | ||||
| -rwxr-xr-x | tkimg/tiff/configure | 72 | ||||
| -rw-r--r-- | tkimg/tiff/configure.in | 3 | ||||
| -rw-r--r-- | tkimg/tiff/tkimgtiffConfig.sh.in | 26 | ||||
| -rw-r--r-- | tkimg/window/Makefile.in | 1 | ||||
| -rwxr-xr-x | tkimg/window/configure | 72 | ||||
| -rw-r--r-- | tkimg/window/configure.in | 3 | ||||
| -rw-r--r-- | tkimg/window/tkimgwindowConfig.sh.in | 26 |
20 files changed, 430 insertions, 80 deletions
diff --git a/tkimg/gif/Makefile.in b/tkimg/gif/Makefile.in index 83e4c39..619265c 100644 --- a/tkimg/gif/Makefile.in +++ b/tkimg/gif/Makefile.in @@ -433,6 +433,7 @@ install-lib-binaries: echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ fi + $(INSTALL_DATA) tkimggifConfig.sh $(DESTDIR)$(libdir) #======================================================================== # Install binary executables (e.g. .exe files and dependent .dll files) diff --git a/tkimg/gif/configure b/tkimg/gif/configure index 672ef21..d9d63eb 100755 --- a/tkimg/gif/configure +++ b/tkimg/gif/configure @@ -620,6 +620,15 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +PATCHLEVEL +MINOR_VERSION +MAJOR_VERSION +tkimggif_STUB_LIB_PATH +tkimggif_BUILD_STUB_LIB_PATH +tkimggif_STUB_LIB_SPEC +tkimggif_BUILD_STUB_LIB_SPEC +tkimggif_LIB_SPEC +tkimggif_BUILD_LIB_SPEC WISH_PROG TCLSH_PROG VC_MANIFEST_EMBED_EXE @@ -2117,7 +2126,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2817,7 +2826,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2932,7 +2941,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2975,7 +2984,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3034,7 +3043,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3086,7 +3095,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4046,7 +4055,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4412,7 +4421,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5104,7 +5113,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac if test "${TEA_PLATFORM}" = "unix" ; then @@ -9159,7 +9168,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : $as_echo_n "(cached) " >&6 else @@ -9695,13 +9704,45 @@ $as_echo "${WISH_PROG}" >&6; } + #-------------------------------------------------------------------- + # These are for tkimggifConfig.sh + #-------------------------------------------------------------------- + + # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) + eval pkglibdir="${libdir}/tkimggif${PACKAGE_VERSION}" + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval tkimggif_LIB_FLAG="-ltkimggif${PACKAGE_VERSION}${DBGX}" + eval tkimggif_STUB_LIB_FLAG="-ltkimggifstub${PACKAGE_VERSION}${DBGX}" + else + eval tkimggif_LIB_FLAG="-ltkimggif`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + eval tkimggif_STUB_LIB_FLAG="-ltkimggifstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + fi + tkimggif_BUILD_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimggif_LIB_FLAG}" + tkimggif_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimggif_LIB_FLAG}" + tkimggif_BUILD_STUB_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimggif_STUB_LIB_FLAG}" + tkimggif_STUB_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimggif_STUB_LIB_FLAG}" + tkimggif_BUILD_STUB_LIB_PATH="`$CYGPATH $(pwd)`/${PKG_STUB_LIB_FILE}" + tkimggif_STUB_LIB_PATH="`$CYGPATH ${pkglibdir}`/${PKG_STUB_LIB_FILE}" + + + + + + + + + + + + + #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. # You may alternatively have a special pkgIndex.tcl.in or other files # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile tkimggifConfig.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10411,8 +10452,9 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "tkimggifConfig.sh") CONFIG_FILES="$CONFIG_FILES tkimggifConfig.sh" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -10620,7 +10662,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10648,7 +10690,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -10675,7 +10717,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff --git a/tkimg/gif/configure.in b/tkimg/gif/configure.in index 0fed3a5..6d144af 100644 --- a/tkimg/gif/configure.in +++ b/tkimg/gif/configure.in @@ -186,6 +186,7 @@ fi TEA_PROG_TCLSH TEA_PROG_WISH +TEA_EXPORT_CONFIG(tkimggif) #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. @@ -193,6 +194,6 @@ TEA_PROG_WISH # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -AC_OUTPUT([Makefile]) +AC_OUTPUT([Makefile tkimggifConfig.sh]) #-------------------------------------------------------------------- diff --git a/tkimg/gif/tkimggifConfig.sh.in b/tkimg/gif/tkimggifConfig.sh.in new file mode 100644 index 0000000..d774315 --- /dev/null +++ b/tkimg/gif/tkimggifConfig.sh.in @@ -0,0 +1,26 @@ +# tkimggifConfig.sh -- +# +# This shell script (for sh) is generated automatically by tkimggif's +# configure script. It will create shell variables for most of +# the configuration options discovered by the configure script. +# This script is intended to be included by the configure scripts +# for tkimggif extensions so that they don't have to figure this all +# out for themselves. This file does not duplicate information +# already provided by tclConfig.sh, so you may need to use that +# file in addition to this one. +# +# The information in this file is specific to a single platform. + +# tkimggif's version number. +tkimggif_VERSION='@PACKAGE_VERSION@' + +# The name of the tkimggif library (may be either a .a file or a shared library): +tkimggif_LIB_FILE=@PKG_LIB_FILE@ + +# String to pass to linker to pick up the tkimggif library from its +# build directory. +tkimggif_BUILD_LIB_SPEC='@tkimggif_BUILD_LIB_SPEC@' + +# String to pass to linker to pick up the tkimggif library from its +# installed directory. +tkimggif_LIB_SPEC='@tkimggif_LIB_SPEC@' diff --git a/tkimg/jpeg/Makefile.in b/tkimg/jpeg/Makefile.in index 02501c2..5147173 100644 --- a/tkimg/jpeg/Makefile.in +++ b/tkimg/jpeg/Makefile.in @@ -437,6 +437,7 @@ install-lib-binaries: echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ fi + $(INSTALL_DATA) tkimgjpegConfig.sh $(DESTDIR)$(libdir) #======================================================================== # Install binary executables (e.g. .exe files and dependent .dll files) diff --git a/tkimg/jpeg/configure b/tkimg/jpeg/configure index 2aaf968..b1ed264 100755 --- a/tkimg/jpeg/configure +++ b/tkimg/jpeg/configure @@ -620,6 +620,15 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +PATCHLEVEL +MINOR_VERSION +MAJOR_VERSION +tkimgjpeg_STUB_LIB_PATH +tkimgjpeg_BUILD_STUB_LIB_PATH +tkimgjpeg_STUB_LIB_SPEC +tkimgjpeg_BUILD_STUB_LIB_SPEC +tkimgjpeg_LIB_SPEC +tkimgjpeg_BUILD_LIB_SPEC WISH_PROG TCLSH_PROG VC_MANIFEST_EMBED_EXE @@ -2129,7 +2138,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2829,7 +2838,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2944,7 +2953,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2987,7 +2996,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3046,7 +3055,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3098,7 +3107,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4058,7 +4067,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4424,7 +4433,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5116,7 +5125,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac if test "${TEA_PLATFORM}" = "unix" ; then @@ -9457,7 +9466,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10015,13 +10024,45 @@ $as_echo "${WISH_PROG}" >&6; } + #-------------------------------------------------------------------- + # These are for tkimgjpegConfig.sh + #-------------------------------------------------------------------- + + # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) + eval pkglibdir="${libdir}/tkimgjpeg${PACKAGE_VERSION}" + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval tkimgjpeg_LIB_FLAG="-ltkimgjpeg${PACKAGE_VERSION}${DBGX}" + eval tkimgjpeg_STUB_LIB_FLAG="-ltkimgjpegstub${PACKAGE_VERSION}${DBGX}" + else + eval tkimgjpeg_LIB_FLAG="-ltkimgjpeg`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + eval tkimgjpeg_STUB_LIB_FLAG="-ltkimgjpegstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + fi + tkimgjpeg_BUILD_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimgjpeg_LIB_FLAG}" + tkimgjpeg_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimgjpeg_LIB_FLAG}" + tkimgjpeg_BUILD_STUB_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimgjpeg_STUB_LIB_FLAG}" + tkimgjpeg_STUB_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimgjpeg_STUB_LIB_FLAG}" + tkimgjpeg_BUILD_STUB_LIB_PATH="`$CYGPATH $(pwd)`/${PKG_STUB_LIB_FILE}" + tkimgjpeg_STUB_LIB_PATH="`$CYGPATH ${pkglibdir}`/${PKG_STUB_LIB_FILE}" + + + + + + + + + + + + + #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. # You may alternatively have a special pkgIndex.tcl.in or other files # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile tkimgjpegConfig.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10731,8 +10772,9 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "tkimgjpegConfig.sh") CONFIG_FILES="$CONFIG_FILES tkimgjpegConfig.sh" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -10940,7 +10982,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10968,7 +11010,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -10995,7 +11037,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff --git a/tkimg/jpeg/configure.in b/tkimg/jpeg/configure.in index 4b5a45a..e4048d2 100644 --- a/tkimg/jpeg/configure.in +++ b/tkimg/jpeg/configure.in @@ -195,6 +195,7 @@ fi TEA_PROG_TCLSH TEA_PROG_WISH +TEA_EXPORT_CONFIG(tkimgjpeg) #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. @@ -202,6 +203,6 @@ TEA_PROG_WISH # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -AC_OUTPUT([Makefile]) +AC_OUTPUT([Makefile tkimgjpegConfig.sh]) #-------------------------------------------------------------------- diff --git a/tkimg/jpeg/tkimgjpegConfig.sh.in b/tkimg/jpeg/tkimgjpegConfig.sh.in new file mode 100644 index 0000000..8ef0dee --- /dev/null +++ b/tkimg/jpeg/tkimgjpegConfig.sh.in @@ -0,0 +1,26 @@ +# tkimgjpegConfig.sh -- +# +# This shell script (for sh) is generated automatically by tkimgjpeg's +# configure script. It will create shell variables for most of +# the configuration options discovered by the configure script. +# This script is intended to be included by the configure scripts +# for tkimgjpeg extensions so that they don't have to figure this all +# out for themselves. This file does not duplicate information +# already provided by tclConfig.sh, so you may need to use that +# file in addition to this one. +# +# The information in this file is specific to a single platform. + +# tkimgjpeg's version number. +tkimgjpeg_VERSION='@PACKAGE_VERSION@' + +# The name of the tkimgjpeg library (may be either a .a file or a shared library): +tkimgjpeg_LIB_FILE=@PKG_LIB_FILE@ + +# String to pass to linker to pick up the tkimgjpeg library from its +# build directory. +tkimgjpeg_BUILD_LIB_SPEC='@tkimgjpeg_BUILD_LIB_SPEC@' + +# String to pass to linker to pick up the tkimgjpeg library from its +# installed directory. +tkimgjpeg_LIB_SPEC='@tkimgjpeg_LIB_SPEC@' diff --git a/tkimg/png/Makefile.in b/tkimg/png/Makefile.in index ab6877f..c99a730 100644 --- a/tkimg/png/Makefile.in +++ b/tkimg/png/Makefile.in @@ -441,6 +441,7 @@ install-lib-binaries: echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ fi + $(INSTALL_DATA) tkimgpngConfig.sh $(DESTDIR)$(libdir) #======================================================================== # Install binary executables (e.g. .exe files and dependent .dll files) diff --git a/tkimg/png/configure b/tkimg/png/configure index 7c9e17e..208c4da 100755 --- a/tkimg/png/configure +++ b/tkimg/png/configure @@ -620,6 +620,15 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +PATCHLEVEL +MINOR_VERSION +MAJOR_VERSION +tkimgpng_STUB_LIB_PATH +tkimgpng_BUILD_STUB_LIB_PATH +tkimgpng_STUB_LIB_SPEC +tkimgpng_BUILD_STUB_LIB_SPEC +tkimgpng_LIB_SPEC +tkimgpng_BUILD_LIB_SPEC WISH_PROG TCLSH_PROG VC_MANIFEST_EMBED_EXE @@ -2141,7 +2150,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2841,7 +2850,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2956,7 +2965,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2999,7 +3008,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3058,7 +3067,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3110,7 +3119,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4070,7 +4079,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4436,7 +4445,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5128,7 +5137,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac if test "${TEA_PLATFORM}" = "unix" ; then @@ -9759,7 +9768,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10317,13 +10326,45 @@ $as_echo "${WISH_PROG}" >&6; } + #-------------------------------------------------------------------- + # These are for tkimgpngConfig.sh + #-------------------------------------------------------------------- + + # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) + eval pkglibdir="${libdir}/tkimgpng${PACKAGE_VERSION}" + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval tkimgpng_LIB_FLAG="-ltkimgpng${PACKAGE_VERSION}${DBGX}" + eval tkimgpng_STUB_LIB_FLAG="-ltkimgpngstub${PACKAGE_VERSION}${DBGX}" + else + eval tkimgpng_LIB_FLAG="-ltkimgpng`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + eval tkimgpng_STUB_LIB_FLAG="-ltkimgpngstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + fi + tkimgpng_BUILD_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimgpng_LIB_FLAG}" + tkimgpng_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimgpng_LIB_FLAG}" + tkimgpng_BUILD_STUB_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimgpng_STUB_LIB_FLAG}" + tkimgpng_STUB_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimgpng_STUB_LIB_FLAG}" + tkimgpng_BUILD_STUB_LIB_PATH="`$CYGPATH $(pwd)`/${PKG_STUB_LIB_FILE}" + tkimgpng_STUB_LIB_PATH="`$CYGPATH ${pkglibdir}`/${PKG_STUB_LIB_FILE}" + + + + + + + + + + + + + #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. # You may alternatively have a special pkgIndex.tcl.in or other files # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile tkimgpngConfig.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -11033,8 +11074,9 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "tkimgpngConfig.sh") CONFIG_FILES="$CONFIG_FILES tkimgpngConfig.sh" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -11242,7 +11284,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -11270,7 +11312,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -11297,7 +11339,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff --git a/tkimg/png/configure.in b/tkimg/png/configure.in index a8bd49d..ff977c1 100644 --- a/tkimg/png/configure.in +++ b/tkimg/png/configure.in @@ -203,6 +203,7 @@ fi TEA_PROG_TCLSH TEA_PROG_WISH +TEA_EXPORT_CONFIG(tkimgpng) #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. @@ -210,6 +211,6 @@ TEA_PROG_WISH # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -AC_OUTPUT([Makefile]) +AC_OUTPUT([Makefile tkimgpngConfig.sh]) #-------------------------------------------------------------------- diff --git a/tkimg/png/tkimgpngConfig.sh.in b/tkimg/png/tkimgpngConfig.sh.in new file mode 100644 index 0000000..7d62ca7 --- /dev/null +++ b/tkimg/png/tkimgpngConfig.sh.in @@ -0,0 +1,26 @@ +# tkimgpngConfig.sh -- +# +# This shell script (for sh) is generated automatically by tkimgpng's +# configure script. It will create shell variables for most of +# the configuration options discovered by the configure script. +# This script is intended to be included by the configure scripts +# for tkimgpng extensions so that they don't have to figure this all +# out for themselves. This file does not duplicate information +# already provided by tclConfig.sh, so you may need to use that +# file in addition to this one. +# +# The information in this file is specific to a single platform. + +# tkimgpng's version number. +tkimgpng_VERSION='@PACKAGE_VERSION@' + +# The name of the tkimgpng library (may be either a .a file or a shared library): +tkimgpng_LIB_FILE=@PKG_LIB_FILE@ + +# String to pass to linker to pick up the tkimgpng library from its +# build directory. +tkimgpng_BUILD_LIB_SPEC='@tkimgpng_BUILD_LIB_SPEC@' + +# String to pass to linker to pick up the tkimgpng library from its +# installed directory. +tkimgpng_LIB_SPEC='@tkimgpng_LIB_SPEC@' diff --git a/tkimg/tiff/Makefile.in b/tkimg/tiff/Makefile.in index 25b8731..07047e8 100644 --- a/tkimg/tiff/Makefile.in +++ b/tkimg/tiff/Makefile.in @@ -445,6 +445,7 @@ install-lib-binaries: echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ fi + $(INSTALL_DATA) tkimgtiffConfig.sh $(DESTDIR)$(libdir) #======================================================================== # Install binary executables (e.g. .exe files and dependent .dll files) diff --git a/tkimg/tiff/configure b/tkimg/tiff/configure index ef009f5..f3a9885 100755 --- a/tkimg/tiff/configure +++ b/tkimg/tiff/configure @@ -620,6 +620,15 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +PATCHLEVEL +MINOR_VERSION +MAJOR_VERSION +tkimgtiff_STUB_LIB_PATH +tkimgtiff_BUILD_STUB_LIB_PATH +tkimgtiff_STUB_LIB_SPEC +tkimgtiff_BUILD_STUB_LIB_SPEC +tkimgtiff_LIB_SPEC +tkimgtiff_BUILD_LIB_SPEC WISH_PROG TCLSH_PROG VC_MANIFEST_EMBED_EXE @@ -2153,7 +2162,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2853,7 +2862,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2968,7 +2977,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3011,7 +3020,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3070,7 +3079,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3122,7 +3131,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4082,7 +4091,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4448,7 +4457,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5140,7 +5149,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac if test "${TEA_PLATFORM}" = "unix" ; then @@ -10068,7 +10077,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10670,13 +10679,45 @@ $as_echo "${WISH_PROG}" >&6; } + #-------------------------------------------------------------------- + # These are for tkimgtiffConfig.sh + #-------------------------------------------------------------------- + + # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) + eval pkglibdir="${libdir}/tkimgtiff${PACKAGE_VERSION}" + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval tkimgtiff_LIB_FLAG="-ltkimgtiff${PACKAGE_VERSION}${DBGX}" + eval tkimgtiff_STUB_LIB_FLAG="-ltkimgtiffstub${PACKAGE_VERSION}${DBGX}" + else + eval tkimgtiff_LIB_FLAG="-ltkimgtiff`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + eval tkimgtiff_STUB_LIB_FLAG="-ltkimgtiffstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + fi + tkimgtiff_BUILD_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimgtiff_LIB_FLAG}" + tkimgtiff_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimgtiff_LIB_FLAG}" + tkimgtiff_BUILD_STUB_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimgtiff_STUB_LIB_FLAG}" + tkimgtiff_STUB_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimgtiff_STUB_LIB_FLAG}" + tkimgtiff_BUILD_STUB_LIB_PATH="`$CYGPATH $(pwd)`/${PKG_STUB_LIB_FILE}" + tkimgtiff_STUB_LIB_PATH="`$CYGPATH ${pkglibdir}`/${PKG_STUB_LIB_FILE}" + + + + + + + + + + + + + #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. # You may alternatively have a special pkgIndex.tcl.in or other files # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile tkimgtiffConfig.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -11386,8 +11427,9 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "tkimgtiffConfig.sh") CONFIG_FILES="$CONFIG_FILES tkimgtiffConfig.sh" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -11595,7 +11637,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -11623,7 +11665,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -11650,7 +11692,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff --git a/tkimg/tiff/configure.in b/tkimg/tiff/configure.in index 7d0d3a1..0cbc22a 100644 --- a/tkimg/tiff/configure.in +++ b/tkimg/tiff/configure.in @@ -216,6 +216,7 @@ fi TEA_PROG_TCLSH TEA_PROG_WISH +TEA_EXPORT_CONFIG(tkimgtiff) #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. @@ -223,6 +224,6 @@ TEA_PROG_WISH # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -AC_OUTPUT([Makefile]) +AC_OUTPUT([Makefile tkimgtiffConfig.sh]) #-------------------------------------------------------------------- diff --git a/tkimg/tiff/tkimgtiffConfig.sh.in b/tkimg/tiff/tkimgtiffConfig.sh.in new file mode 100644 index 0000000..de85cce --- /dev/null +++ b/tkimg/tiff/tkimgtiffConfig.sh.in @@ -0,0 +1,26 @@ +# tkimgtiffConfig.sh -- +# +# This shell script (for sh) is generated automatically by tkimgtiff's +# configure script. It will create shell variables for most of +# the configuration options discovered by the configure script. +# This script is intended to be included by the configure scripts +# for tkimgtiff extensions so that they don't have to figure this all +# out for themselves. This file does not duplicate information +# already provided by tclConfig.sh, so you may need to use that +# file in addition to this one. +# +# The information in this file is specific to a single platform. + +# tkimgtiff's version number. +tkimgtiff_VERSION='@PACKAGE_VERSION@' + +# The name of the tkimgtiff library (may be either a .a file or a shared library): +tkimgtiff_LIB_FILE=@PKG_LIB_FILE@ + +# String to pass to linker to pick up the tkimgtiff library from its +# build directory. +tkimgtiff_BUILD_LIB_SPEC='@tkimgtiff_BUILD_LIB_SPEC@' + +# String to pass to linker to pick up the tkimgtiff library from its +# installed directory. +tkimgtiff_LIB_SPEC='@tkimgtiff_LIB_SPEC@' diff --git a/tkimg/window/Makefile.in b/tkimg/window/Makefile.in index 7fd1d16..cd6790e 100644 --- a/tkimg/window/Makefile.in +++ b/tkimg/window/Makefile.in @@ -436,6 +436,7 @@ install-lib-binaries: echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ fi + $(INSTALL_DATA) tkimgwindowConfig.sh $(DESTDIR)$(libdir) #======================================================================== # Install binary executables (e.g. .exe files and dependent .dll files) diff --git a/tkimg/window/configure b/tkimg/window/configure index 4df8f46..d129134 100755 --- a/tkimg/window/configure +++ b/tkimg/window/configure @@ -620,6 +620,15 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +PATCHLEVEL +MINOR_VERSION +MAJOR_VERSION +tkimgwindow_STUB_LIB_PATH +tkimgwindow_BUILD_STUB_LIB_PATH +tkimgwindow_STUB_LIB_SPEC +tkimgwindow_BUILD_STUB_LIB_SPEC +tkimgwindow_LIB_SPEC +tkimgwindow_BUILD_LIB_SPEC WISH_PROG TCLSH_PROG VC_MANIFEST_EMBED_EXE @@ -2120,7 +2129,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2820,7 +2829,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2935,7 +2944,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2978,7 +2987,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3037,7 +3046,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3089,7 +3098,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4049,7 +4058,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4415,7 +4424,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5107,7 +5116,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac if test "${TEA_PLATFORM}" = "unix" ; then @@ -9481,7 +9490,7 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : $as_echo_n "(cached) " >&6 else @@ -10028,13 +10037,45 @@ $as_echo "${WISH_PROG}" >&6; } + #-------------------------------------------------------------------- + # These are for tkimgwindowConfig.sh + #-------------------------------------------------------------------- + + # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) + eval pkglibdir="${libdir}/tkimgwindow${PACKAGE_VERSION}" + if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + eval tkimgwindow_LIB_FLAG="-ltkimgwindow${PACKAGE_VERSION}${DBGX}" + eval tkimgwindow_STUB_LIB_FLAG="-ltkimgwindowstub${PACKAGE_VERSION}${DBGX}" + else + eval tkimgwindow_LIB_FLAG="-ltkimgwindow`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + eval tkimgwindow_STUB_LIB_FLAG="-ltkimgwindowstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" + fi + tkimgwindow_BUILD_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimgwindow_LIB_FLAG}" + tkimgwindow_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimgwindow_LIB_FLAG}" + tkimgwindow_BUILD_STUB_LIB_SPEC="-L`$CYGPATH $(pwd)` ${tkimgwindow_STUB_LIB_FLAG}" + tkimgwindow_STUB_LIB_SPEC="-L`$CYGPATH ${pkglibdir}` ${tkimgwindow_STUB_LIB_FLAG}" + tkimgwindow_BUILD_STUB_LIB_PATH="`$CYGPATH $(pwd)`/${PKG_STUB_LIB_FILE}" + tkimgwindow_STUB_LIB_PATH="`$CYGPATH ${pkglibdir}`/${PKG_STUB_LIB_FILE}" + + + + + + + + + + + + + #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. # You may alternatively have a special pkgIndex.tcl.in or other files # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile tkimgwindowConfig.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10744,8 +10785,9 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "tkimgwindowConfig.sh") CONFIG_FILES="$CONFIG_FILES tkimgwindowConfig.sh" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -10953,7 +10995,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -10981,7 +11023,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -11008,7 +11050,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff --git a/tkimg/window/configure.in b/tkimg/window/configure.in index 68d14c8..1903855 100644 --- a/tkimg/window/configure.in +++ b/tkimg/window/configure.in @@ -196,6 +196,7 @@ fi TEA_PROG_TCLSH TEA_PROG_WISH +TEA_EXPORT_CONFIG(tkimgwindow) #-------------------------------------------------------------------- # Finally, substitute all of the various values into the Makefile. @@ -203,6 +204,6 @@ TEA_PROG_WISH # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -AC_OUTPUT([Makefile]) +AC_OUTPUT([Makefile tkimgwindowConfig.sh]) #-------------------------------------------------------------------- diff --git a/tkimg/window/tkimgwindowConfig.sh.in b/tkimg/window/tkimgwindowConfig.sh.in new file mode 100644 index 0000000..b1df3b8 --- /dev/null +++ b/tkimg/window/tkimgwindowConfig.sh.in @@ -0,0 +1,26 @@ +# tkimgwindowConfig.sh -- +# +# This shell script (for sh) is generated automatically by tkimgwindow's +# configure script. It will create shell variables for most of +# the configuration options discovered by the configure script. +# This script is intended to be included by the configure scripts +# for tkimgwindow extensions so that they don't have to figure this all +# out for themselves. This file does not duplicate information +# already provided by tclConfig.sh, so you may need to use that +# file in addition to this one. +# +# The information in this file is specific to a single platform. + +# tkimgwindow's version number. +tkimgwindow_VERSION='@PACKAGE_VERSION@' + +# The name of the tkimgwindow library (may be either a .a file or a shared library): +tkimgwindow_LIB_FILE=@PKG_LIB_FILE@ + +# String to pass to linker to pick up the tkimgwindow library from its +# build directory. +tkimgwindow_BUILD_LIB_SPEC='@tkimgwindow_BUILD_LIB_SPEC@' + +# String to pass to linker to pick up the tkimgwindow library from its +# installed directory. +tkimgwindow_LIB_SPEC='@tkimgwindow_LIB_SPEC@' |