From: Luca Padovani <luca.padovani@unito.it>
Date: Thu, 30 Nov 2000 13:24:54 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: nogzip~130
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=4f98c8cd1032a2a0f24b7c1a90eede8dfdbccbbe;p=helm.git

*** empty log message ***
---

diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.1/configure.mk b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.1/configure.mk
index 860e1b46b..8982371ee 100644
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.1/configure.mk
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.1/configure.mk
@@ -47,18 +47,12 @@ config.make:
 	@echo GTKLIBS=`$(GTKGETLIBS)` | \
 	  sed -e 's/-l/-cclib &/g' -e 's/-[LRWr][^ ]*/-ccopt &/g' \
 	  >> config.make
-<<<<<<< configure.mk
 # Luca: GtkMathView configuration
 	@echo GTKMATHVIEWCFLAGS=`gtkmathview-config --cflags` >> config.make
 	@echo MINIDOMCFLAGS=`minidom-config --cflags` >> config.make
 	@echo GTKMATHVIEWLIBS=`gtkmathview-config --libs` >> config.make
 	@echo MINIDOMLIBS=`minidom-config --libs` >> config.make
 # Luca: end of GtkMathView configuration
-=======
-	#<CSC>
-	echo GTKMATHVIEWLIBS="-ccopt \""`gtkmathview-config --libs`"\"" >> config.make
-	#</CSC>
->>>>>>> 1.2
 	@echo GNOMELIBS=$(GNOMELIBS) | \
 	  sed -e 's/-l/-cclib &/g' -e 's/-[LRWr][^ ]*/-ccopt &/g' \
 	  >> config.make