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

Diff for /JSOC/configure between version 1.30 and 1.36

version 1.30, 2008/07/15 21:03:51 version 1.36, 2009/01/29 19:53:12
Line 215  if ($CHKLIBS == "no") then
Line 215  if ($CHKLIBS == "no") then
             cd ..             cd ..
  
             cd ..             cd ..
         else          #else
 # Non-Stanford users: edit these lines to reflect the location of required # Non-Stanford users: edit these lines to reflect the location of required
 #  3rd party libs: cfitsio.a #  3rd party libs: cfitsio.a
             ln -sfv /usr/local/include include              #ln -sfv /usr/local/include include
             if (!(-d lib)) mkdir lib              #if (!(-d lib)) mkdir lib
             ln -sfv /usr/local/lib lib/$JSOC_MACHINE              #ln -sfv /usr/local/lib lib/$JSOC_MACHINE
         endif         endif
  
         set TPWARN = 0         set TPWARN = 0
Line 231  if ($CHKLIBS == "no") then
Line 231  if ($CHKLIBS == "no") then
                 echo "Can't find required library: lib/linux_x86_64/libcfitsio.a"                 echo "Can't find required library: lib/linux_x86_64/libcfitsio.a"
                 set TPWARN = 1                 set TPWARN = 1
             endif             endif
   
             if (!(-e lib/linux_x86_64/libcfitsio_gcc.a)) then  
                 echo "Can't find required library: lib/linux_x86_64/libcfitsio_gcc.a"  
                 set TPWARN = 1  
             endif  
         endif         endif
  
         if ($JSOC_MACHINE == "linux_ia32") then         if ($JSOC_MACHINE == "linux_ia32") then
Line 255  if ($CHKLIBS == "no") then
Line 250  if ($CHKLIBS == "no") then
         if (-e ../suflag.txt) then         if (-e ../suflag.txt) then
             # Stanford users' required libs.             # Stanford users' required libs.
             if ($JSOC_MACHINE == "linux_x86_64") then             if ($JSOC_MACHINE == "linux_x86_64") then
                   if (!(-e lib/linux_x86_64/libcfitsio_gcc.a)) then
                       echo "Can't find required library: lib/linux_x86_64/libcfitsio_gcc.a"
                       set TPWARN = 1
                   endif
                 if (!(-e lib/linux_x86_64/libfftw3f.a)) then                 if (!(-e lib/linux_x86_64/libfftw3f.a)) then
                     echo "Can't find required library: lib/linux_x86_64/libfftw3f.a"                     echo "Can't find required library: lib/linux_x86_64/libfftw3f.a"
                     set TPWARN = 1                     set TPWARN = 1
Line 299  if ($CHKLIBS == "no") then
Line 298  if ($CHKLIBS == "no") then
         endif         endif
  
         cd ..         cd ..
   
           # Set custom make file to tell the make system that the gcc cfitsio library is called
           # libcfitsio_gcc.a
           if (-e suflag.txt) then
               echo "CFITSIOFNAME_GCC_X86_64 = cfitsio_gcc" > custom.mk
           endif
   
           # Make customizations - ensure changes here are synchronized to changes in make_basic.mk
           if (!(-e suflag.txt)) then
               # put compilation customizations here
               # echo "DRMS_DEFAULT_RETENTION = -10" >> custom.mk
           endif
   
         echo "done"         echo "done"
         echo         echo
  
Line 340  if ($CHKLIBS == "yes") then
Line 352  if ($CHKLIBS == "yes") then
  
  
 endif endif
   
   # Call gen_init.csh to generate localized scripts and localization.h
   if (!(-e suflag.txt)) then
       echo "CUSTOM_DEFINES = __LOCALIZED_DEFS__" >> custom.mk
       ./gen_init.csh
   endif


Legend:
Removed from v.1.30  
changed lines
  Added in v.1.36

Karen Tian
Powered by
ViewCVS 0.9.4