*** empty log message ***

3 files changed, 25 insertions, 24 deletions

diff --git a/Perl/Makefile.PL b/Perl/Makefile.PL.in
index 00d9c32..6f31dd7 100644
--- a/Perl/Makefile.PL
+++ b/Perl/Makefile.PL.in
@@ -1,7 +1,4 @@
 #
-# The first argument should be the name of the zinc library
-# either ptkzinc or ptkzinc_debug for example. The second
-# argument is the path to pTk in the system.
 #
 use Tk::MMutil;
 use Tk::Config;
@@ -14,5 +11,5 @@ Tk::MMutil::TkExtMakefile(
 			  'OBJECT' => '$(O_FILES)',
 			  'VERSION_FROM' => 'Zinc.pm',
 			  'XS_VERSION' => $Tk::Config::VERSION,
-			  'INC' => "-I. -I$ARGV[1]",
-			  'LIBS' => ["-L/usr/X11R6/lib -lX11 -l$ARGV[0]"]);
+			  'INC' => "-I. -I@PERL_TK_LIB@/pTk",
+			  'LIBS' => ["-L/usr/X11R6/lib -lX11 -L@prefix@/lib -l@PACKAGE@@VERSION@"]);
diff --git a/Perl/Zinc.pm b/Perl/Zinc.pm
index 624b45f..f08809f 100644
--- a/Perl/Zinc.pm
+++ b/Perl/Zinc.pm
@@ -5,6 +5,7 @@ package Tk::Zinc;
 
 #require Tk;
 use Tk;
+use Tk::Photo;
 #use AutoLoader;
 #use Exporter;
 use Carp;
diff --git a/Perl/Zinc.xs b/Perl/Zinc.xs
index d3f04e3..323a53a 100644
--- a/Perl/Zinc.xs
+++ b/Perl/Zinc.xs
@@ -8,13 +8,14 @@
 #include <perl.h>
 #include <XSUB.h>
 
-#include "tkGlue.def"
+#include <tkGlue.def>
 
-#include "pTk/tkPort.h"
-#include "pTk/tkInt.h"
-#include "pTk/tkVMacro.h"
-#include "tkGlue.h"
-#include "tkGlue.m"
+#include <pTk/tkPort.h>
+#include <pTk/tkInt.h>
+#include <pTk/tkImgPhoto.h>
+#include <pTk/tkVMacro.h>
+#include <tkGlue.h>
+#include <tkGlue.m>
 
 extern int
 ZincObjCmd(
@@ -24,21 +25,21 @@ ZincObjCmd(
 	   Tcl_Obj *args[]);
 
 extern int
-VideomapObjCmd(
-	       ClientData client_data,
-	       Tcl_Interp* interp,
-	       int argc,
-	       Tcl_Obj *args[]);
+ZnVideomapObjCmd(
+	         ClientData client_data,
+	         Tcl_Interp* interp,
+	         int argc,
+	         Tcl_Obj *args[]);
 
 extern int
-MapInfoObjCmd(
-	      ClientData client_data,
-	      Tcl_Interp* interp,
-	      int argc,
-	      Tcl_Obj *args[]);
+ZnMapInfoObjCmd(
+	        ClientData client_data,
+	        Tcl_Interp* interp,
+	        int argc,
+	        Tcl_Obj *args[]);
 
 DECLARE_VTABLES;
-
+TkimgphotoVtab *TkimgphotoVptr;
 
 MODULE = Tk::Zinc	PACKAGE = Tk::Zinc
 
@@ -47,7 +48,9 @@ PROTOTYPES: DISABLE
 BOOT:
  {
   IMPORT_VTABLES;
+  TkimgphotoVptr = (TkimgphotoVtab *) SvIV(perl_get_sv("Tk::TkimgphotoVtab",GV_ADDWARN|GV_ADD));
+
   Lang_TkCommand("zinc", ZincObjCmd);
-  Lang_TkCommand("videomap", VideomapObjCmd);
-  Lang_TkCommand("mapinfo", MapInfoObjCmd);
+  Lang_TkCommand("videomap", ZnVideomapObjCmd);
+  Lang_TkCommand("mapinfo", ZnMapInfoObjCmd);
  }