(file) Return to configure CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/configure between version 1.51 and 1.52

version 1.51, 2009/09/22 17:43:03 version 1.52, 2009/09/22 21:09:24
Line 114  if ($CHKLIBS == "no") then
Line 114  if ($CHKLIBS == "no") then
             endif             endif
         endif         endif
         echo "done"         echo "done"
   
         echo "Setting links to headers..."  
         if (!(-d base/include)) then  
             mkdir -p base/include  
         endif  
         cd base/include  
         find .. -path '../include' -prune -o -name \*.h  \( \( -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \; \)  
         cd ../..  
   
         if (!(-d include)) then  
             mkdir -p include  
         endif  
         cd include  
         if (-d ../base/include) then  
             find ../base/include -name \*.h -exec ln -s {} . \;  
         endif  
         cd ..  
         echo "done"  
         echo         echo
  
         echo "Setting links to scripts..."         echo "Setting links to scripts..."
Line 173  if ($CHKLIBS == "no") then
Line 155  if ($CHKLIBS == "no") then
             echo 'POSTGRES_LIB = pq' >> custom.mk             echo 'POSTGRES_LIB = pq' >> custom.mk
             echo 'CFITSIO_LIB = cfitsio' >> custom.mk             echo 'CFITSIO_LIB = cfitsio' >> custom.mk
  
             echo 'ifeq (\$(JSOC_MACHINE), linux_x86_64)\n' >> custom.mk              echo 'ifeq ($(JSOC_MACHINE), linux_x86_64)' >> custom.mk
             echo '  POSTGRES_INCS = /usr/include' >> custom.mk             echo '  POSTGRES_INCS = /usr/include' >> custom.mk
             echo '  POSTGRES_LIBS = /usr/lib64' >> custom.mk             echo '  POSTGRES_LIBS = /usr/lib64' >> custom.mk
             echo '  CFITSIO_INCS = /home/jsoc/include' >> custom.mk             echo '  CFITSIO_INCS = /home/jsoc/include' >> custom.mk
             echo '  CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64' >> custom.mk             echo '  CFITSIO_LIBS = /home/jsoc/lib/linux-x86_64' >> custom.mk
             echo 'endif' >> custom.mk             echo 'endif' >> custom.mk
  
             echo 'ifeq (\$(JSOC_MACHINE), linux_ia32)\n' >> custom.mk              echo 'ifeq ($(JSOC_MACHINE), linux_ia32)' >> custom.mk
             echo '  POSTGRES_INCS = /usr/include' >> custom.mk             echo '  POSTGRES_INCS = /usr/include' >> custom.mk
             echo '  POSTGRES_LIBS = /usr/lib' >> custom.mk             echo '  POSTGRES_LIBS = /usr/lib' >> custom.mk
             echo '  CFITSIO_INCS = /home/jsoc/include' >> custom.mk             echo '  CFITSIO_INCS = /home/jsoc/include' >> custom.mk
Line 243  if (!(-e suflag.txt)) then
Line 225  if (!(-e suflag.txt)) then
     ./gen_init.csh     ./gen_init.csh
     ./customizemake.pl     ./customizemake.pl
   endif   endif
 else if (-e config.local)  else if (-e config.local) then
     # config.local is optional at Stanford, but it won't necessarily contain the same information that     # config.local is optional at Stanford, but it won't necessarily contain the same information that
     # a NetDRMS config.local contains. The first section contains items that will override the     # a NetDRMS config.local contains. The first section contains items that will override the
     # the items in serverdefs.h. The second section contains items used to populate custom.mk,     # the items in serverdefs.h. The second section contains items used to populate custom.mk,
Line 262  else if (-e config.local)
Line 244  else if (-e config.local)
     ./customizemake.pl     ./customizemake.pl
 endif endif
  
   echo "Setting links to headers..."
   if (!(-d base/include)) then
       mkdir -p base/include
   endif
   cd base/include
   find .. -path '../include' -prune -o -name \*.h  \( \( -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \; \)
   cd ../..
   
   if (!(-d include)) then
       mkdir -p include
   endif
   cd include
   if (-d ../base/include) then
       find ../base/include -name \*.h -exec ln -s {} . \;
   endif
   cd ..
   echo "done"
   echo
   
 # Customize compilers # Customize compilers
 # echo "JSOC_COMPILER = gcc" >> custom.mk # echo "JSOC_COMPILER = gcc" >> custom.mk
 # echo "JSOC_FCOMPILER = gfortran" >> custom.mk # echo "JSOC_FCOMPILER = gfortran" >> custom.mk


Legend:
Removed from v.1.51  
changed lines
  Added in v.1.52

Karen Tian
Powered by
ViewCVS 0.9.4