Am�lioration de la compil sous Solaris.

Int�gration des patches pour redhat/mandrake

1 files changed, 16 insertions, 10 deletions

diff --git a/Makefile.in b/Makefile.in
index ffbad64..2e05955 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,11 +52,12 @@ LDFLAGS = -L. @LDFLAGS@ @X_LIBS@ @LOCAL_X_LIBS@
 SHARED_LIB_CFLAGS = @sharedlib_cflags@
 SHARED_TK_LDFLAGS = @sharedlib_buildflags@
 TCL_TK_VER = 8.0
+TK_INCLUDE_PATH=/usr/include/tcl$(TCL_TK_VER)
 SHARED_TK_LIBS = @X_LIBS@ @LOCAL_X_LIBS@ @XMU@ -lXext -lX11 @X_EXTRA_LIBS@ -lm
 ZINC_VER = @ZINC_VER@
 ZINC_MAJOR = @ZINC_MAJOR@
 CFLAGS = -Wall $(SHARED_LIB_CFLAGS)
-CPPFLAGS =  @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(srcdir) -DBUILD_LIBRARY
+CPPFLAGS =  @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(TK_INCLUDE_PATH) -I$(srcdir) -DBUILD_LIBRARY
 #
 # Linux
 #PTKLIB = /usr/lib/perl5/i386-linux/5.004/Tk/pTk
@@ -68,7 +69,6 @@ CPPFLAGS =  @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(srcdir) -DBUILD_LIBRARY
 #
 # Auto
 PTKLIB = @INSTALLARCHLIB@/Tk/pTk
-SITEPERL = @SITEPERL@
 PTKCFLAGS = -DPTK -I$(PTKLIB)
 #
 # Define this to use the polygon clipper.
@@ -76,23 +76,29 @@ GPC=libgpc.so
 #GPC=
 #
 # Define this to use the local rendering engine.
-ART=-lart_lgpl
-#ART=
+#ART=-lart_lgpl
+ART=
+#
+# Define this to use OpenGL
+#
+#GLX=-lGLU -lGL
+GLX=
+
 #
 # Recognized compilation time flags are :
 #
-#	PERFOS		compile performance measurement code
 #	PROFILE		ask for profile support
 #	OM		include code for internal overlap manager
 #	SHM		include code that need shared memory support
 #	LIBART		include code that need the libart rendering lib
+#	GLX		include code that need GL support.
 #	SHAPE		include code for reshaping windows.
 #	GPC		include code for composing polygons.
 #
 ifeq ($(strip $(GPC)),'')
 DFLAGS = -DOM -DSHAPE
 else
-DFLAGS= -DOM -DSHAPE -DSHM -DGPC
+DFLAGS= -DOM -DSHAPE -DGPC -DSHM
 endif
 #DFLAGS = -DTCL_MEM_DEBUG
 
@@ -160,16 +166,16 @@ Perl/Makefile_debug:
 	(cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR)_debug $(PERLCONFIG))
 
 libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkobjs) libom.so $(GPC)
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom $(GPC) $(ART) $(ptkobjs)
+	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom $(GPC) $(ART) $(GLX) $(ptkobjs)
 libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkgobjs) libom_debug.so $(GPC)
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS)  -L. -lom_debug $(GPC) $(ART) $(ptkgobjs)
+	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS)  -L. -lom_debug $(GPC) $(GLX) $(ART) $(ptkgobjs)
 
 tkzinc: tkzinc$(ZINC_VER).$(ZINC_MAJOR).so
 tkzinc$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkobjs) libom.so $(GPC)
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom $(GPC) $(ART) $(tkobjs)
+	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom $(GPC) $(GLX) $(ART) $(tkobjs)
 tkzinc_debug: tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so
 tkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: tk $(tkgobjs) libom_debug.so $(GPC)
-	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L.  -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom_debug $(GPC) $(ART) $(tkgobjs)
+	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L.  -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom_debug $(GPC) $(GLX) $(ART) $(tkgobjs)
 tkzinc_profile: tkzinc_profile.a libom.so
 	$(CC) -pg -o zincwish $(SHARED_TK_LIBS) -L.  -ltk$(TCL_TK_VER) -ltcl$(TCL_TK_VER) -lom tkAppInit.c tkzinc_profile.a -o zincwish
 tkzinc_profile.a: tk $(tkpgobjs) libom_debug.so