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

Diff for /JSOC/configure between version 1.28 and 1.41

version 1.28, 2008/07/14 21:08:46 version 1.41, 2009/01/30 19:18:14
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
             ln -sfv /usr/local/lib lib              #if (!(-d lib)) mkdir lib
         endif              #ln -sfv /usr/local/lib lib/$JSOC_MACHINE
   
         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/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             endif
  
             if ($JSOC_MACHINE == "linux_ia32") then          cd ..
                 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          # Set custom make file to tell the make system that the gcc cfitsio library is called
                 if (!(-e lib/mac_osx/libfftw3f.a)) then          # libcfitsio_gcc.a
                     echo "Can't find required library: lib/mac_osx/libfftw3f.a"          if (-e suflag.txt) then
                     set TPWARN = 1              echo "CFITSIOFNAME_GCC_X86_64 = cfitsio_gcc" > custom.mk
                 endif  
             endif  
         else  
             # Non-Stanford users' required libs.  
         endif         endif
  
         if ($TPWARN) then          # Make customizations - ensure changes here are synchronized to changes in make_basic.mk
             echo "Did you update configure to create links to installed third-party libraries?"          if (!(-e suflag.txt)) then
               # put compilation customizations here
               # echo "DRMS_DEFAULT_RETENTION = -10" >> custom.mk
         endif         endif
  
         cd ..  
         echo "done"         echo "done"
         echo         echo
  
Line 334  if ($CHKLIBS == "yes") then
Line 278  if ($CHKLIBS == "yes") then
  
  
 endif endif
   
   # Site Localization
   if (!(-e suflag.txt)) then
       if (!(-e config.local)) then
           echo "Error: config.local not found. If you have a saved version of this file from a previous installation, you should copy that into this directory and rerun configure. Otherwise, copy the file config.local.template to config.local and edit the config.local file to contain site-appropriate values.\n"
           echo "*** IMPORTANT *** The edited config.local will contain site-specific values that should not be modified during subsequent updates to NetDRMS. Keep a safe copy of it somewhere outside of the DRMS directory tree, for example in /usr/local. After each NetDRMS update, ensure this file is in place."
       else
           echo "CUSTOM_DEFINES = __LOCALIZED_DEFS__" >> custom.mk
           ./gen_init.csh
       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.28  
changed lines
  Added in v.1.41
Karen Tian
 Powered by
ViewCVS 0.9.4