[Tora-cvs] tora NEWS,1.857,1.858 configure.pl,1.155,1.156

[<hp...@us...>]

Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1:/tmp/cvs-serv29765

Modified Files:
	NEWS configure.pl 
Log Message:


Index: NEWS
===================================================================
RCS file: /cvsroot/tora/tora/NEWS,v
retrieving revision 1.857
retrieving revision 1.858
diff -C2 -d -r1.857 -r1.858
*** NEWS	22 Jul 2003 14:05:17 -0000	1.857
--- NEWS	22 Jul 2003 20:14:14 -0000	1.858
***************
*** 1,4 ****
--- 1,6 ----
  1.3.10:
  
+ 2003-07-22: Changed installation to use a shellscript to set up library path for Oracle libs unless plugins.
+ 2003-07-22: Don't make static imply static oracle. To get static oracle use specific switch.
  2003-07-22: Update API doc.
  2003-07-22: Added new autodetect functionality of watches in debugger.

Index: configure.pl
===================================================================
RCS file: /cvsroot/tora/tora/configure.pl,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** configure.pl	21 Jul 2003 20:42:18 -0000	1.155
--- configure.pl	22 Jul 2003 20:14:15 -0000	1.156
***************
*** 519,522 ****
--- 519,523 ----
      close TEMP;
      if (!system("$gcc $LFlags -I`pwd` $Includes $Libs $QtLibShared $TestDB -o $tmpName $tmpName.cpp")) {
+         $ENV{"LD_LIBRARY_PATH"}=$ENV{"LD_LIBRARY_PATH"}.":".$ENV{"ORACLE_HOME"}."/lib";
  	if (!system($tmpName)) {
  	    $CC=$gcc;
***************
*** 1642,1646 ****
  	-strip \$(TARGET) plugins/* >/dev/null 2>&1
  	cp \$(TARGET) \$(INSTALLBIN)/tora
! 	if [ -f tora-plugin ] ; then rm tora-plugin ; fi
  	rm -f \$(INSTALLLIB)/tora/*.tso
  	-cp plugins/* \$(INSTALLLIB)/tora >/dev/null 2>&1
--- 1643,1654 ----
  	-strip \$(TARGET) plugins/* >/dev/null 2>&1
  	cp \$(TARGET) \$(INSTALLBIN)/tora
! 	if [ -f tora-plugin ]
! 	then
! 		cp \$(TARGET) \$(INSTALLBIN)/tora
! 		rm -f tora-plugin
! 	else
! 		cp \$(TARGET) \$(INSTALLBIN)/tora.real
! 		cp rpm/tora.sh \$(INSTALLBIN)/tora
! 	fi
  	rm -f \$(INSTALLLIB)/tora/*.tso
  	-cp plugins/* \$(INSTALLLIB)/tora >/dev/null 2>&1
***************
*** 1675,1680 ****
  uninstall:
  	\@echo Uninstalling from \$(INSTALLPREFIX)
! 	rm \$(INSTALLBIN)/tora
! 	rm -rf \$(INSTALLLIB)/tora
  
  clean:
--- 1683,1689 ----
  uninstall:
  	\@echo Uninstalling from \$(INSTALLPREFIX)
! 	-rm -f \$(INSTALLBIN)/tora
! 	-rm -f \$(INSTALLBIN)/tora.real
! 	-rm -rf \$(INSTALLLIB)/tora
  
  clean:
***************
*** 1686,1690 ****
  	-rm -rf plugins >/dev/null 2>&1
  	-for a in *.ui ; \\
!              do rm `\$(PERL) -e '\$\$_=shift(\@ARGV); s/\\.[^\\.]*\$\$//; print "\$\$_.h\\n\$\$_.cpp";' \$\$a`; \\
           done
  
--- 1695,1699 ----
  	-rm -rf plugins >/dev/null 2>&1
  	-for a in *.ui ; \\
!              do rm -f `\$(PERL) -e '\$\$_=shift(\@ARGV); s/\\.[^\\.]*\$\$//; print "\$\$_.h\\n\$\$_.cpp";' \$\$a`; \\
           done
  
***************
*** 1695,1702 ****
  	-rm -f *.moc qtlegacy/*.moc >/dev/null 2>&1 
  	-rm -f rpmcommon rpmoracle rpmmysql >/dev/null 2>&1 
! 	-rm \\#*\\# >/dev/null 2>&1
! 	-rm Makefile >/dev/null 2>&1
! 	-rm LICENSE.h >/dev/null 2>&1
! 	-rm configure.setup >/dev/null 2>&1
  
  # This pretty requires a kdoc installtion and reference files for Qt and KDE Libs.
--- 1704,1711 ----
  	-rm -f *.moc qtlegacy/*.moc >/dev/null 2>&1 
  	-rm -f rpmcommon rpmoracle rpmmysql >/dev/null 2>&1 
! 	-rm -f \\#*\\# >/dev/null 2>&1
! 	-rm -f Makefile >/dev/null 2>&1
! 	-rm -f LICENSE.h >/dev/null 2>&1
! 	-rm -f configure.setup >/dev/null 2>&1
  
  # This pretty requires a kdoc installtion and reference files for Qt and KDE Libs.
***************
*** 1755,1759 ****
  	\@echo Linking \$\@
  	\$(GCC) \$(LFLAGS) \$(CFLAGS) \$(LFLAGS_GLOB) -DTOMONOLITHIC -o \$\@ \$(OBJECTS) main.cpp \\
! 		\$(QT_STATIC) \$(STDCPP_STATIC) \$(ORACLE_STATIC) \$(LIBS_GLOB) \\
  		/usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a \\
  		\$(MYSQL_STATIC) /usr/lib/libpq.a
--- 1764,1768 ----
  	\@echo Linking \$\@
  	\$(GCC) \$(LFLAGS) \$(CFLAGS) \$(LFLAGS_GLOB) -DTOMONOLITHIC -o \$\@ \$(OBJECTS) main.cpp \\
! 		\$(QT_STATIC) \$(STDCPP_STATIC) \$(ORACLE_SHARED) \$(LIBS_GLOB) \\
  		/usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a \\
  		\$(MYSQL_STATIC) /usr/lib/libpq.a