Index: Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/Makefile.in,v retrieving revision 1.5 diff -u -u -p -r1.5 Makefile.in --- Makefile.in 7 Feb 2003 07:08:34 -0000 1.5 +++ Makefile.in 26 Dec 2003 01:23:53 -0000 @@ -120,11 +120,17 @@ collate: all exec_prefix=$$here/Img/exec_prefix \ prefix=$$here/Img/prefix \ pkglibdir=$$here/Img/exec_prefix/lib/Img \ + libdir=$$here/Img/exec_prefix/lib \ + DESTDIR= \ ; \ cd $$here ; \ cat Img/exec_prefix/lib/Img/pkgIndex.tcl >> pkgIndex.tcl ; \ done mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl + for p in Img/exec_prefix/lib/*.sh ; do \ + sed -e 's#$(libdir)/[^/ ]*\([/ ]\)#$(LIB_RUNTIME_DIR)\1#' \ + $$p > $$p.1 && mv -f $$p.1 $$p ; \ + done install: collate mkdir -p $(INSTALL_ROOT)$(LIB_RUNTIME_DIR) Index: base/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/base/Makefile.in,v retrieving revision 1.5 diff -u -u -p -r1.5 Makefile.in --- base/Makefile.in 10 Dec 2002 06:26:43 -0000 1.5 +++ base/Makefile.in 26 Dec 2003 01:23:54 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJ $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) -rm -f $($(PACKAGE)stub_LIB_FILE) ${MAKE_STUB_LIB} - $(RANLIB) $($(PACKAGE)stub_LIB_FILE) + $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -435,8 +437,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: base/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/base/configure,v retrieving revision 1.4 diff -u -u -p -r1.4 configure --- base/configure 4 Apr 2003 21:36:38 -0000 1.4 +++ base/configure 26 Dec 2003 01:24:00 -0000 @@ -5784,6 +5784,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5825,6 +5826,7 @@ EOF + #-------------------------------------------------------------------- @@ -5845,7 +5847,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:5849: checking for tclsh" >&5 +echo "configure:5851: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5877,7 +5879,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:5881: checking for wish" >&5 +echo "configure:5883: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6163,6 +6165,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g s%@tkimg_BUILD_LIB_SPEC@%$tkimg_BUILD_LIB_SPEC%g Index: base/tclconfig/tcl.m4 =================================================================== RCS file: /cvsroot/tkimg/tkimg/base/tclconfig/tcl.m4,v retrieving revision 1.2 diff -u -u -p -r1.2 tcl.m4 --- base/tclconfig/tcl.m4 4 Apr 2003 21:36:39 -0000 1.2 +++ base/tclconfig/tcl.m4 26 Dec 2003 01:24:04 -0000 @@ -2591,6 +2591,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -2632,6 +2633,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) + AC_SUBST(RANLIB_STUB) ]) #------------------------------------------------------------------------ Index: bmp/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/bmp/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- bmp/Makefile.in 7 Feb 2003 07:08:35 -0000 1.4 +++ bmp/Makefile.in 26 Dec 2003 01:24:05 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: bmp/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/bmp/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- bmp/configure 4 Apr 2003 21:36:40 -0000 1.5 +++ bmp/configure 26 Dec 2003 01:24:12 -0000 @@ -5944,6 +5944,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5985,6 +5986,7 @@ EOF + #-------------------------------------------------------------------- @@ -6011,7 +6013,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6015: checking for tclsh" >&5 +echo "configure:6017: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6043,7 +6045,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6047: checking for wish" >&5 +echo "configure:6049: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6302,6 +6304,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: gif/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/gif/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- gif/Makefile.in 7 Feb 2003 07:08:35 -0000 1.4 +++ gif/Makefile.in 26 Dec 2003 01:24:12 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: gif/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/gif/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- gif/configure 4 Apr 2003 21:36:41 -0000 1.5 +++ gif/configure 26 Dec 2003 01:24:20 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: ico/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/ico/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- ico/Makefile.in 7 Feb 2003 07:08:35 -0000 1.4 +++ ico/Makefile.in 26 Dec 2003 01:24:20 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: ico/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/ico/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- ico/configure 4 Apr 2003 21:36:42 -0000 1.5 +++ ico/configure 26 Dec 2003 01:24:27 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: jpeg/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/jpeg/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- jpeg/Makefile.in 7 Feb 2003 07:08:35 -0000 1.4 +++ jpeg/Makefile.in 26 Dec 2003 01:24:28 -0000 @@ -144,6 +144,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -171,6 +172,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -310,7 +312,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -453,8 +455,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: jpeg/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/jpeg/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- jpeg/configure 4 Apr 2003 21:36:44 -0000 1.5 +++ jpeg/configure 26 Dec 2003 01:24:34 -0000 @@ -6096,6 +6096,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -6137,6 +6138,7 @@ EOF + #-------------------------------------------------------------------- @@ -6165,7 +6167,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6169: checking for tclsh" >&5 +echo "configure:6171: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6197,7 +6199,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6201: checking for wish" >&5 +echo "configure:6203: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6465,6 +6467,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: libjpeg/tcl/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/libjpeg/tcl/Makefile.in,v retrieving revision 1.2 diff -u -u -p -r1.2 Makefile.in --- libjpeg/tcl/Makefile.in 7 Dec 2002 00:11:37 -0000 1.2 +++ libjpeg/tcl/Makefile.in 26 Dec 2003 01:24:35 -0000 @@ -159,6 +159,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -182,6 +183,7 @@ TCL_LIBS = @TCL_LIBS@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -306,7 +308,7 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJ $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) -rm -f $($(PACKAGE)stub_LIB_FILE) ${MAKE_STUB_LIB} - $(RANLIB) $($(PACKAGE)stub_LIB_FILE) + $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: libjpeg/tcl/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/libjpeg/tcl/configure,v retrieving revision 1.2 diff -u -u -p -r1.2 configure --- libjpeg/tcl/configure 4 Apr 2003 21:36:52 -0000 1.2 +++ libjpeg/tcl/configure 26 Dec 2003 01:24:41 -0000 @@ -5182,6 +5182,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5223,6 +5224,7 @@ EOF + #-------------------------------------------------------------------- @@ -5243,7 +5245,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_L echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:5247: checking for tclsh" >&5 +echo "configure:5249: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5537,6 +5539,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@jpegtcl_BUILD_LIB_SPEC@%$jpegtcl_BUILD_LIB_SPEC%g s%@jpegtcl_LIB_SPEC@%$jpegtcl_LIB_SPEC%g Index: libjpeg/tcl/tclconfig/tcl.m4 =================================================================== RCS file: /cvsroot/tkimg/tkimg/libjpeg/tcl/tclconfig/tcl.m4,v retrieving revision 1.2 diff -u -u -p -r1.2 tcl.m4 --- libjpeg/tcl/tclconfig/tcl.m4 4 Apr 2003 21:36:52 -0000 1.2 +++ libjpeg/tcl/tclconfig/tcl.m4 26 Dec 2003 01:24:45 -0000 @@ -2591,6 +2591,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -2632,6 +2633,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) + AC_SUBST(RANLIB_STUB) ]) #------------------------------------------------------------------------ Index: libpng/tcl/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/libpng/tcl/Makefile.in,v retrieving revision 1.3 diff -u -u -p -r1.3 Makefile.in --- libpng/tcl/Makefile.in 10 Dec 2002 06:26:44 -0000 1.3 +++ libpng/tcl/Makefile.in 26 Dec 2003 01:24:46 -0000 @@ -152,6 +152,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -175,6 +176,7 @@ TCL_LIBS = @TCL_LIBS@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -301,7 +303,7 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJ $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) -rm -f $($(PACKAGE)stub_LIB_FILE) ${MAKE_STUB_LIB} - $(RANLIB) $($(PACKAGE)stub_LIB_FILE) + $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -437,8 +439,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: libpng/tcl/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/libpng/tcl/configure,v retrieving revision 1.2 diff -u -u -p -r1.2 configure --- libpng/tcl/configure 4 Apr 2003 21:36:53 -0000 1.2 +++ libpng/tcl/configure 26 Dec 2003 01:24:52 -0000 @@ -5329,6 +5329,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5370,6 +5371,7 @@ EOF + #-------------------------------------------------------------------- @@ -5396,7 +5398,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_L echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:5400: checking for tclsh" >&5 +echo "configure:5402: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5677,6 +5679,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@pngtcl_BUILD_LIB_SPEC@%$pngtcl_BUILD_LIB_SPEC%g s%@pngtcl_LIB_SPEC@%$pngtcl_LIB_SPEC%g Index: libpng/tcl/tclconfig/tcl.m4 =================================================================== RCS file: /cvsroot/tkimg/tkimg/libpng/tcl/tclconfig/tcl.m4,v retrieving revision 1.2 diff -u -u -p -r1.2 tcl.m4 --- libpng/tcl/tclconfig/tcl.m4 4 Apr 2003 21:36:54 -0000 1.2 +++ libpng/tcl/tclconfig/tcl.m4 26 Dec 2003 01:24:55 -0000 @@ -2591,6 +2591,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -2632,6 +2633,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) + AC_SUBST(RANLIB_STUB) ]) #------------------------------------------------------------------------ Index: libtiff/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/libtiff/Makefile.in,v retrieving revision 1.1.1.1 diff -u -u -p -r1.1.1.1 Makefile.in --- libtiff/Makefile.in 10 May 2002 17:20:32 -0000 1.1.1.1 +++ libtiff/Makefile.in 26 Dec 2003 01:24:56 -0000 @@ -39,6 +39,7 @@ CC = @CCOMPILER@ AR = @AR@ AROPTS = @AROPTS@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ INSTALL = @INSTALL@ # Index: libtiff/tcl/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/libtiff/tcl/Makefile.in,v retrieving revision 1.2 diff -u -u -p -r1.2 Makefile.in --- libtiff/tcl/Makefile.in 7 Dec 2002 00:11:37 -0000 1.2 +++ libtiff/tcl/Makefile.in 26 Dec 2003 01:24:57 -0000 @@ -153,6 +153,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -176,6 +177,7 @@ TCL_LIBS = @TCL_LIBS@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -300,7 +302,7 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJ $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) -rm -f $($(PACKAGE)stub_LIB_FILE) ${MAKE_STUB_LIB} - $(RANLIB) $($(PACKAGE)stub_LIB_FILE) + $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -436,8 +438,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: libtiff/tcl/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/libtiff/tcl/configure,v retrieving revision 1.2 diff -u -u -p -r1.2 configure --- libtiff/tcl/configure 4 Apr 2003 21:36:55 -0000 1.2 +++ libtiff/tcl/configure 26 Dec 2003 01:25:03 -0000 @@ -5290,6 +5290,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5331,6 +5332,7 @@ EOF + #-------------------------------------------------------------------- @@ -5351,7 +5353,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_L echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:5355: checking for tclsh" >&5 +echo "configure:5357: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5651,6 +5653,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@tifftcl_BUILD_LIB_SPEC@%$tifftcl_BUILD_LIB_SPEC%g s%@tifftcl_LIB_SPEC@%$tifftcl_LIB_SPEC%g Index: libtiff/tcl/tclconfig/tcl.m4 =================================================================== RCS file: /cvsroot/tkimg/tkimg/libtiff/tcl/tclconfig/tcl.m4,v retrieving revision 1.2 diff -u -u -p -r1.2 tcl.m4 --- libtiff/tcl/tclconfig/tcl.m4 4 Apr 2003 21:36:55 -0000 1.2 +++ libtiff/tcl/tclconfig/tcl.m4 26 Dec 2003 01:25:14 -0000 @@ -2591,6 +2591,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -2632,6 +2633,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) + AC_SUBST(RANLIB_STUB) ]) #------------------------------------------------------------------------ Index: libz/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/libz/Makefile.in,v retrieving revision 1.1.1.1 diff -u -u -p -r1.1.1.1 Makefile.in --- libz/Makefile.in 10 May 2002 17:20:13 -0000 1.1.1.1 +++ libz/Makefile.in 26 Dec 2003 01:25:14 -0000 @@ -61,6 +61,7 @@ all: example minigzip test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ + @DYLD_LIBRARY_PATH=.:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ echo hello world | ./minigzip | ./minigzip -d || \ echo ' *** minigzip test FAILED ***' ; \ if ./example; then \ Index: libz/tcl/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/libz/tcl/Makefile.in,v retrieving revision 1.2 diff -u -u -p -r1.2 Makefile.in --- libz/tcl/Makefile.in 7 Dec 2002 00:11:37 -0000 1.2 +++ libz/tcl/Makefile.in 26 Dec 2003 01:25:14 -0000 @@ -148,6 +148,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -171,6 +172,7 @@ TCL_LIBS = @TCL_LIBS@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -295,7 +297,7 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJ $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) -rm -f $($(PACKAGE)stub_LIB_FILE) ${MAKE_STUB_LIB} - $(RANLIB) $($(PACKAGE)stub_LIB_FILE) + $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -431,8 +433,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: libz/tcl/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/libz/tcl/configure,v retrieving revision 1.2 diff -u -u -p -r1.2 configure --- libz/tcl/configure 4 Apr 2003 21:36:56 -0000 1.2 +++ libz/tcl/configure 26 Dec 2003 01:25:15 -0000 @@ -5180,6 +5180,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5221,6 +5222,7 @@ EOF + #-------------------------------------------------------------------- @@ -5241,7 +5243,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_L echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:5245: checking for tclsh" >&5 +echo "configure:5247: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5514,6 +5516,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@zlibtcl_BUILD_LIB_SPEC@%$zlibtcl_BUILD_LIB_SPEC%g s%@zlibtcl_LIB_SPEC@%$zlibtcl_LIB_SPEC%g Index: libz/tcl/tclconfig/tcl.m4 =================================================================== RCS file: /cvsroot/tkimg/tkimg/libz/tcl/tclconfig/tcl.m4,v retrieving revision 1.2 diff -u -u -p -r1.2 tcl.m4 --- libz/tcl/tclconfig/tcl.m4 4 Apr 2003 21:36:57 -0000 1.2 +++ libz/tcl/tclconfig/tcl.m4 26 Dec 2003 01:25:19 -0000 @@ -2591,6 +2591,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -2632,6 +2633,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) + AC_SUBST(RANLIB_STUB) ]) #------------------------------------------------------------------------ Index: pcx/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/pcx/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- pcx/Makefile.in 7 Feb 2003 07:08:35 -0000 1.4 +++ pcx/Makefile.in 26 Dec 2003 01:25:24 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: pcx/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/pcx/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- pcx/configure 4 Apr 2003 21:36:58 -0000 1.5 +++ pcx/configure 26 Dec 2003 01:25:26 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: pixmap/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/pixmap/Makefile.in,v retrieving revision 1.3 diff -u -u -p -r1.3 Makefile.in --- pixmap/Makefile.in 7 Feb 2003 07:08:35 -0000 1.3 +++ pixmap/Makefile.in 26 Dec 2003 01:25:27 -0000 @@ -141,6 +141,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -170,6 +171,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -305,7 +307,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -446,8 +448,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: pixmap/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/pixmap/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- pixmap/configure 4 Apr 2003 21:36:59 -0000 1.5 +++ pixmap/configure 26 Dec 2003 01:25:34 -0000 @@ -6018,6 +6018,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -6059,6 +6060,7 @@ EOF + #-------------------------------------------------------------------- @@ -6085,7 +6087,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6089: checking for tclsh" >&5 +echo "configure:6091: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6117,7 +6119,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6121: checking for wish" >&5 +echo "configure:6123: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6389,6 +6391,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: png/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/png/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- png/Makefile.in 7 Feb 2003 07:08:36 -0000 1.4 +++ png/Makefile.in 26 Dec 2003 01:25:35 -0000 @@ -148,6 +148,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -175,6 +176,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -317,7 +319,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -460,8 +462,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: png/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/png/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- png/configure 4 Apr 2003 21:37:00 -0000 1.5 +++ png/configure 26 Dec 2003 01:25:41 -0000 @@ -6248,6 +6248,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -6289,6 +6290,7 @@ EOF + #-------------------------------------------------------------------- @@ -6317,7 +6319,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6321: checking for tclsh" >&5 +echo "configure:6323: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6349,7 +6351,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6353: checking for wish" >&5 +echo "configure:6355: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6626,6 +6628,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: ppm/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/ppm/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- ppm/Makefile.in 7 Feb 2003 07:08:36 -0000 1.4 +++ ppm/Makefile.in 26 Dec 2003 01:25:42 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: ppm/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/ppm/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- ppm/configure 4 Apr 2003 21:37:01 -0000 1.5 +++ ppm/configure 26 Dec 2003 01:27:47 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: ps/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/ps/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- ps/Makefile.in 7 Feb 2003 07:08:36 -0000 1.4 +++ ps/Makefile.in 26 Dec 2003 01:27:48 -0000 @@ -141,6 +141,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -168,6 +169,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -301,7 +303,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -445,8 +447,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: ps/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/ps/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- ps/configure 4 Apr 2003 21:37:02 -0000 1.5 +++ ps/configure 26 Dec 2003 01:27:55 -0000 @@ -5945,6 +5945,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5986,6 +5987,7 @@ EOF + #-------------------------------------------------------------------- @@ -6012,7 +6014,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6016: checking for tclsh" >&5 +echo "configure:6018: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6044,7 +6046,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6048: checking for wish" >&5 +echo "configure:6050: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6304,6 +6306,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: sgi/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/sgi/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- sgi/Makefile.in 7 Feb 2003 07:08:36 -0000 1.4 +++ sgi/Makefile.in 26 Dec 2003 01:27:56 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: sgi/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/sgi/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- sgi/configure 4 Apr 2003 21:37:03 -0000 1.5 +++ sgi/configure 26 Dec 2003 01:28:02 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: sun/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/sun/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- sun/Makefile.in 7 Feb 2003 07:08:37 -0000 1.4 +++ sun/Makefile.in 26 Dec 2003 01:28:03 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: sun/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/sun/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- sun/configure 4 Apr 2003 21:37:04 -0000 1.5 +++ sun/configure 26 Dec 2003 01:28:10 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: tclconfig/tcl.m4 =================================================================== RCS file: /cvsroot/tkimg/tkimg/tclconfig/tcl.m4,v retrieving revision 1.2 diff -u -u -p -r1.2 tcl.m4 --- tclconfig/tcl.m4 4 Apr 2003 21:37:04 -0000 1.2 +++ tclconfig/tcl.m4 26 Dec 2003 01:28:13 -0000 @@ -2591,6 +2591,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -2632,6 +2633,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) + AC_SUBST(RANLIB_STUB) ]) #------------------------------------------------------------------------ Index: tga/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/tga/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- tga/Makefile.in 7 Feb 2003 07:08:37 -0000 1.4 +++ tga/Makefile.in 26 Dec 2003 01:28:14 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: tga/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/tga/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- tga/configure 4 Apr 2003 21:37:05 -0000 1.5 +++ tga/configure 26 Dec 2003 01:28:21 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: tiff/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/tiff/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- tiff/Makefile.in 7 Feb 2003 07:08:37 -0000 1.4 +++ tiff/Makefile.in 26 Dec 2003 01:28:22 -0000 @@ -155,6 +155,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -182,6 +183,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -327,7 +329,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -470,8 +472,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: tiff/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/tiff/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- tiff/configure 4 Apr 2003 21:37:06 -0000 1.5 +++ tiff/configure 26 Dec 2003 01:28:28 -0000 @@ -6400,6 +6400,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -6441,6 +6442,7 @@ EOF + #-------------------------------------------------------------------- @@ -6473,7 +6475,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6477: checking for tclsh" >&5 +echo "configure:6479: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6505,7 +6507,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6509: checking for wish" >&5 +echo "configure:6511: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6791,6 +6793,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: tiff/tiffJpeg.c =================================================================== RCS file: /cvsroot/tkimg/tkimg/tiff/tiffJpeg.c,v retrieving revision 1.1 diff -u -u -p -r1.1 tiffJpeg.c --- tiff/tiffJpeg.c 29 Nov 2002 08:57:56 -0000 1.1 +++ tiff/tiffJpeg.c 26 Dec 2003 01:28:30 -0000 @@ -225,7 +225,7 @@ TIFFjpeg_output_message(cinfo) * values per libtiff practice. */ #define CALLJPEG(sp, fail, op) (SETJMP((sp)->exit_jmpbuf) ? (fail) : (op)) -#define CALLVJPEG(sp, op) CALLJPEG(sp, 0, ((op),1)) +#define CALLVJPEG(sp, op) (SETJMP((sp)->exit_jmpbuf) ? (0) : ((op),1)) static int Index: window/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/window/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- window/Makefile.in 7 Feb 2003 07:08:37 -0000 1.4 +++ window/Makefile.in 26 Dec 2003 01:28:31 -0000 @@ -141,6 +141,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -170,6 +171,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -304,7 +306,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -447,8 +449,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: window/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/window/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- window/configure 4 Apr 2003 21:37:07 -0000 1.5 +++ window/configure 26 Dec 2003 01:28:38 -0000 @@ -6018,6 +6018,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -6059,6 +6060,7 @@ EOF + #-------------------------------------------------------------------- @@ -6085,7 +6087,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6089: checking for tclsh" >&5 +echo "configure:6091: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6117,7 +6119,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6121: checking for wish" >&5 +echo "configure:6123: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6389,6 +6391,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: window/window.c =================================================================== RCS file: /cvsroot/tkimg/tkimg/window/window.c,v retrieving revision 1.1 diff -u -u -p -r1.1 window.c --- window/window.c 29 Nov 2002 08:57:56 -0000 1.1 +++ window/window.c 26 Dec 2003 01:28:38 -0000 @@ -17,7 +17,13 @@ #include "X11/Xutil.h" #ifndef __WIN32__ +# ifndef MAC_OSX_TK # include "X11/Xproto.h" +# else +# include "X11/Xlib.h" +# include "X11/Xfuncproto.h" +# undef X_GetImage +# endif #else # include # include "X11/Xlib.h" Index: xbm/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/xbm/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- xbm/Makefile.in 7 Feb 2003 07:08:37 -0000 1.4 +++ xbm/Makefile.in 26 Dec 2003 01:28:39 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: xbm/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/xbm/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- xbm/configure 4 Apr 2003 21:37:08 -0000 1.5 +++ xbm/configure 26 Dec 2003 01:28:46 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g Index: xpm/Makefile.in =================================================================== RCS file: /cvsroot/tkimg/tkimg/xpm/Makefile.in,v retrieving revision 1.4 diff -u -u -p -r1.4 Makefile.in --- xpm/Makefile.in 7 Feb 2003 07:08:37 -0000 1.4 +++ xpm/Makefile.in 26 Dec 2003 01:28:46 -0000 @@ -140,6 +140,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -167,6 +168,7 @@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_D TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -299,7 +301,7 @@ $($(PACKAGE)_LIB_FILE): init.c $($(PACKA # $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) # -rm -f $($(PACKAGE)stub_LIB_FILE) # ${MAKE_STUB_LIB} -# $(RANLIB) $($(PACKAGE)stub_LIB_FILE) +# $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -442,8 +444,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: xpm/configure =================================================================== RCS file: /cvsroot/tkimg/tkimg/xpm/configure,v retrieving revision 1.5 diff -u -u -p -r1.5 configure --- xpm/configure 4 Apr 2003 21:37:09 -0000 1.5 +++ xpm/configure 26 Dec 2003 01:28:53 -0000 @@ -5943,6 +5943,7 @@ EOF # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -5984,6 +5985,7 @@ EOF + #-------------------------------------------------------------------- @@ -6010,7 +6012,7 @@ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TK_LI echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:6014: checking for tclsh" >&5 +echo "configure:6016: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6042,7 +6044,7 @@ fi echo $ac_n "checking for wish""... $ac_c" 1>&6 -echo "configure:6046: checking for wish" >&5 +echo "configure:6048: checking for wish" >&5 if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6301,6 +6303,7 @@ s%@MAKE_LIB@%$MAKE_LIB%g s%@MAKE_SHARED_LIB@%$MAKE_SHARED_LIB%g s%@MAKE_STATIC_LIB@%$MAKE_STATIC_LIB%g s%@MAKE_STUB_LIB@%$MAKE_STUB_LIB%g +s%@RANLIB_STUB@%$RANLIB_STUB%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@WISH_PROG@%$WISH_PROG%g