summaryrefslogtreecommitdiffstats
path: root/tkimg/jpeg
diff options
context:
space:
mode:
Diffstat (limited to 'tkimg/jpeg')
-rw-r--r--tkimg/jpeg/Makefile.in1
-rwxr-xr-xtkimg/jpeg/configure72
-rw-r--r--tkimg/jpeg/configure.in3
-rw-r--r--tkimg/jpeg/tkimgjpegConfig.sh.in26
4 files changed, 86 insertions, 16 deletions
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@'
generated by cgit v0.12 at 2024-10-31 02:21:14 (GMT)