CVS: tmda-cgi configure,1.18,1.19 ChangeLog,1.74,1.75

Update of /cvsroot/tmda/tmda-cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv29006

Modified Files:
	configure ChangeLog 
Log Message:
Do not force people to use 'cc' - Check for 'gcc' too.


Index: configure
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/configure,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure	24 Nov 2003 18:21:32 -0000	1.18
+++ configure	10 Dec 2003 18:04:31 -0000	1.19
@@ -40,6 +40,12 @@
        represent the user name.
        Current default: %(Config)s
 
+    -C <executable name>
+    --cc <executable name>
+       Specify a different C compiler besides the two defaults we check for
+       (cc and gcc)
+       Current default: %(CC)s
+
     -d <path>
     --display-dir <path>
        Specify a directory for supplimental display files (icons and
@@ -255,6 +261,7 @@
   Ask("""How long (in seconds) may a temporary session file be allowed to sit
 before it risks being cleaned up?""", "SessionExp")
   Ask("What are the odds of cleanup I should use? (0.01 = 1%)", "SessionOdds")
+  Ask("What C compiler should I use? (%s)" % OptD["CC"], "CC" )
   print
 
 Program = sys.argv[0]
@@ -300,6 +307,13 @@
   elif os.path.isdir("/usr/local/lib/python2.2/site-packages/TMDA"):
     OptD["Base"] = "/usr/local/lib/python2.2/site-packages/"
 
+for compiler in ( "cc", "gcc" ):
+  cmdline = "which %s" % compiler
+  ( i, o, e ) = os.popen3( cmdline )
+  if len( o.read() ) > 0:
+    OptD["CC"] = compiler
+    break
+
 def Usage(Code, Msg=""):
   "Show usage information and possibly an error message."
   OptD.update(globals())
@@ -308,11 +322,11 @@
   sys.exit(Code)
 
 try:
-  Opts, Args = getopt.getopt(sys.argv[1:], "b:c:d:e:f:hi:l:m:no:p:r:s:t:",
-    ["base-dir=", "config-file=", "display-dir=", "session-exp=", "file-auth=",
-     "help", "install-prefix=", "virtual-lookup=", "mode=", "no-su",
-     "cleanup-odds", "program-auth=", "remote-auth=", "session-prefix=",
-     "target=", "virtual-user="])
+  Opts, Args = getopt.getopt(sys.argv[1:], "b:c:C:d:e:f:hi:l:m:no:p:r:s:t:",
+    ["base-dir=", "config-file=", "cc=", "display-dir=", "session-exp=",
+     "file-auth=", "help", "install-prefix=", "virtual-lookup=", "mode=",
+     "no-su", "cleanup-odds", "program-auth=", "remote-auth=",
+     "session-prefix=", "target=", "virtual-user="])
 except getopt.error, Msg:
   Usage(1, Msg)
 
@@ -324,6 +338,8 @@
     OptD["Base"] = Arg
   elif Opt in ("-c", "--config-file"):
     OptD["Config"] = Arg
+  elif Opt in ("-C", "--cc"):
+    OptD["CC"] = Arg
   elif Opt in ("-d", "--display-dir"):
     OptD["DispDir"] = Arg
   elif Opt in ("-e", "--session-exp"):
@@ -450,11 +466,12 @@
 # Do not edit by hand
 
 DESTDIR ?= %(TargDir)s
+CC = %(CC)s
 
 all: tmda.cgi
 
 tmda.cgi: tmda-cgi.h
-	cc -I . %(Path)stmda-cgi.c -o tmda.cgi
+	$(CC) -I . %(Path)stmda-cgi.c -o tmda.cgi
 	chmod %(Perm)s tmda.cgi
 
 install: $(DESTDIR)/%(TargFN)s

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda-cgi/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	8 Dec 2003 20:01:16 -0000	1.74
+++ ChangeLog	10 Dec 2003 18:04:31 -0000	1.75
@@ -1,3 +1,8 @@
+2003-12-10  Jim Ramsay      <[email protected]>
+
+	* ./configure now checks for 'cc' and 'gcc' for those few systems
+	  without 'cc' installed (like cygwin)
+
 2003-12-08  Jim Ramsay      <[email protected]>
 
 	* Improved the themeability of the editlist page.