[Aimmath-commit] AIM/WEB-INF/maple AutoConf.mpl,1.7,1.8 AutoConfWin.mpl,1.3,1.4

[<mo...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1:/tmp/cvs-serv29793

Modified Files:
	AutoConf.mpl AutoConfWin.mpl 
Log Message:
Fixed a bug that prevented BLAT from being detected during installation.

Index: AutoConf.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/AutoConf.mpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AutoConf.mpl	25 Sep 2003 19:01:14 -0000	1.7
--- AutoConf.mpl	16 Jan 2004 22:57:15 -0000	1.8
***************
*** 535,562 ****
  ######################################################################
  
- # Look for email program
- 
- if os_os = "Linux" or os_os = "OS X" then
-  Config['SendmailProgram'] :=
-  look_for_prog(
-   "sendmail",
-   "Conf"  = 'SendmailProgram',
-   "Path"  = "sendmail",
-   "Def"   = "/usr/lib/sendmail",
-   "Def"   = "/usr/bin/sendmail"
-  ):
-  setconfig('BLATProgram',""):
-  setconfig('SMTPServer',""):
- else
-  Config['BLATProgram'] := cat(Config['CatalinaHome'],"\\bin\\blat\\blat.exe"):
-  setconfig('SendmailProgram',"");
-  setconfig('SMTPServer',""):
- fi:
- 
- p("\n"):
- 
- 
- ######################################################################
- 
  # Look for upload directory
  
--- 535,538 ----
***************
*** 821,824 ****
--- 797,830 ----
   )):
  fi:
+ ######################################################################
+ 
+ # Look for email program
+ 
+ if os_os = "Linux" or os_os = "OS X" then
+  Config['SendmailProgram'] :=
+  look_for_prog(
+   "sendmail",
+   "Conf"  = 'SendmailProgram',
+   "Path"  = "sendmail",
+   "Def"   = "/usr/lib/sendmail",
+   "Def"   = "/usr/bin/sendmail"
+  ):
+  setconfig('BLATProgram',""):
+  setconfig('SMTPServer',""):
+ else
+  Config['BLATProgram'] :=
+  look_for_prog(
+  "BLATProgram",
+  "Conf" = 'BLATProgram',
+  "Path" = "blat.exe",
+  "Def"  = cat(Config['WebAppDir'],"\\bin\\blat\\blat.exe")
+  ):
+  setconfig('SendmailProgram',"");
+  setconfig('SMTPServer',""):
+ fi:
+ 
+ p("\n"):
+ 
+ ######################################################################
  
  # KM

Index: AutoConfWin.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/AutoConfWin.mpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AutoConfWin.mpl	25 Sep 2003 19:01:14 -0000	1.3
--- AutoConfWin.mpl	16 Jan 2004 22:57:15 -0000	1.4
***************
*** 743,747 ****
   setconfig('SMTPServer',""):
  else
!  Config['BLATProgram'] := cat(Config['CatalinaHome'],"\\bin\\blat\\blat.exe"):
   setconfig('SendmailProgram',"");
   setconfig('SMTPServer',""):
--- 743,753 ----
   setconfig('SMTPServer',""):
  else
!  Config['BLATProgram'] :=
!  look_for_prog(
!  "BLATProgram",
!  "Conf" = 'BLATProgram',
!  "Path" = "blat.exe",
!  "Def"  = cat(Config['WebAppDir'],"\\bin\\blat\\blat.exe")
!  ):
   setconfig('SendmailProgram',"");
   setconfig('SMTPServer',""):
***************
*** 750,754 ****
  p("\n"):
  
! 
  
  setconfig('AliceHistorySize',20):
--- 756,760 ----
  p("\n"):
  
! ######################################################################
  
  setconfig('AliceHistorySize',20):