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

Diff for /JSOC/configure between version 1.34 and 1.40

version 1.34, 2009/01/29 18:55:44 version 1.40, 2009/01/30 00:33:16
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  
   
         set TPWARN = 0  
   
         # Libraries required by all  
         if ($JSOC_MACHINE == "linux_x86_64") then  
             if (!(-e lib/linux_x86_64/libcfitsio.a)) then  
                 echo "Can't find required library: lib/linux_x86_64/libcfitsio.a"  
                 set TPWARN = 1  
             endif  
         endif  
   
         if ($JSOC_MACHINE == "linux_ia32") then  
             if (!(-e lib/linux_ia32/libcfitsio.a)) then  
                 echo "Can't find required library: lib/linux_ia32/libcfitsio.a"  
                 set TPWARN = 1  
             endif  
         endif  
   
         if ($JSOC_MACHINE == "mac_osx") then  
             if (!(-e lib/mac_osx/libcfitsio.a)) then  
                 echo "Can't find required library: lib/mac_osx/libcfitsio.a"  
                 set TPWARN = 1  
             endif  
         endif  
   
         if (-e ../suflag.txt) then  
             # Stanford users' required libs.  
             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  
                     echo "Can't find required library: lib/linux_x86_64/libfftw3f.a"  
                     set TPWARN = 1  
                 endif  
                 if (!(-e lib/linux_x86_64/libgsl.a)) then  
                     echo "Can't find required library: lib/linux_x86_64/libgsl.a"  
                     set TPWARN = 1  
                 endif  
                 if (!(-e lib/linux_x86_64/libgslcblas.a)) then  
                     echo "Can't find required library: lib/linux_x86_64/libgslcblas.a"  
                     set TPWARN = 1  
                 endif  
             endif  
   
             if ($JSOC_MACHINE == "linux_ia32") then  
                 if (!(-e lib/linux_ia32/libfftw3f.a)) then  
                     echo "Can't find required library: lib/linux_ia32/libfftw3f.a"  
                     set TPWARN = 1  
                 endif  
                 if (!(-e lib/linux_ia32/libgsl.a)) then  
                     echo "Can't find required library: lib/linux_ia32/libgsl.a"  
                     set TPWARN = 1  
                 endif  
                 if (!(-e lib/linux_ia32/libgslcblas.a)) then  
                     echo "Can't find required library: lib/linux_ia32/libgslcblas.a"  
                     set TPWARN = 1  
                 endif  
             endif  
   
             if ($JSOC_MACHINE == "mac_osx") then  
                 if (!(-e lib/mac_osx/libfftw3f.a)) then  
                     echo "Can't find required library: lib/mac_osx/libfftw3f.a"  
                     set TPWARN = 1  
                 endif  
             endif  
         else  
             # Non-Stanford users' required libs.  
         endif  
   
         if ($TPWARN) then  
             echo "Did you update configure to create links to installed third-party libraries?"  
         endif         endif
  
         cd ..         cd ..
Line 353  if ($CHKLIBS == "yes") then
Line 279  if ($CHKLIBS == "yes") then
  
 endif endif
  
 # Call gen_init.csh to generate localized scripts and localization.h  # Site Localization
 if (!(-e suflag.txt)) then if (!(-e suflag.txt)) then
       if (!(-e config.local)) then
           echo "You must copy config.local.template to config.local, then edit config.local to contain localized values."
           echo "****IMPORTANT WARNING**** The edited config.local will contain important entries - keep it safe, especially during updates to new NetDRMS versions."
       else
     echo "CUSTOM_DEFINES = __LOCALIZED_DEFS__" >> custom.mk     echo "CUSTOM_DEFINES = __LOCALIZED_DEFS__" >> custom.mk
     ./gen_init.csh     ./gen_init.csh
 endif endif
   endif
   
   # Check for required libraries (must happen after localization, which might set links to such libraries
   set TPWARN = 0
   
   # Libraries required by all
   if ($JSOC_MACHINE == "linux_x86_64") then
       if (!(-e lib_third_party/lib/linux_x86_64/libcfitsio.a)) then
           echo "Can't find required library: lib_third_party/lib/linux_x86_64/libcfitsio.a"
           set TPWARN = 1
       endif
   endif
   
   if ($JSOC_MACHINE == "linux_ia32") then
       if (!(-e lib_third_party/lib/linux_ia32/libcfitsio.a)) then
           echo "Can't find required library: lib_third_party/lib/linux_ia32/libcfitsio.a"
           set TPWARN = 1
       endif
   endif
   
   if ($JSOC_MACHINE == "mac_osx") then
       if (!(-e lib_third_party/lib/mac_osx/libcfitsio.a)) then
           echo "Can't find required library: lib_third_party/lib/mac_osx/libcfitsio.a"
           set TPWARN = 1
       endif
   endif
   
   if (-e ../suflag.txt) then
       # Stanford users' required libs.
       if ($JSOC_MACHINE == "linux_x86_64") then
           if (!(-e lib_third_party/lib/linux_x86_64/libcfitsio_gcc.a)) then
               echo "Can't find required library: lib_third_party/lib/linux_x86_64/libcfitsio_gcc.a"
               set TPWARN = 1
           endif
           if (!(-e lib_third_party/lib/linux_x86_64/libfftw3f.a)) then
               echo "Can't find required library: lib_third_party/lib/linux_x86_64/libfftw3f.a"
               set TPWARN = 1
           endif
           if (!(-e lib_third_party/lib/linux_x86_64/libgsl.a)) then
               echo "Can't find required library: lib_third_party/lib/linux_x86_64/libgsl.a"
               set TPWARN = 1
           endif
           if (!(-e lib_third_party/lib/linux_x86_64/libgslcblas.a)) then
               echo "Can't find required library: lib_third_party/lib/linux_x86_64/libgslcblas.a"
               set TPWARN = 1
           endif
       endif
   
       if ($JSOC_MACHINE == "linux_ia32") then
           if (!(-e lib_third_party/lib/linux_ia32/libfftw3f.a)) then
               echo "Can't find required library: lib_third_party/lib/linux_ia32/libfftw3f.a"
               set TPWARN = 1
           endif
           if (!(-e lib_third_party/lib/linux_ia32/libgsl.a)) then
               echo "Can't find required library: lib_third_party/lib/linux_ia32/libgsl.a"
               set TPWARN = 1
           endif
           if (!(-e lib_third_party/lib/linux_ia32/libgslcblas.a)) then
               echo "Can't find required library: lib_third_party/lib/linux_ia32/libgslcblas.a"
               set TPWARN = 1
           endif
       endif
   
       if ($JSOC_MACHINE == "mac_osx") then
           if (!(-e lib_third_party/lib/mac_osx/libfftw3f.a)) then
               echo "Can't find required library: lib_third_party/lib/mac_osx/libfftw3f.a"
               set TPWARN = 1
           endif
       endif
   endif
   
   if ($TPWARN) then
       echo "Did you update config.local to create links to installed third-party libraries?"
   endif

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.40
Karen Tian
 Powered by
ViewCVS 0.9.4