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

Diff for /JSOC/configure between version 1.13 and 1.22

version 1.13, 2007/12/11 21:51:50 version 1.22, 2008/04/08 00:31:26
Line 46  if ($CHKLIBS == "no") then
Line 46  if ($CHKLIBS == "no") then
         find . -name "*.h" -exec rm {} \;         find . -name "*.h" -exec rm {} \;
         cd ../..         cd ../..
     endif     endif
   
       if (-d include) then
           cd include
           find . -name "*.h" -exec rm {} \;
           cd ..
       endif
     echo "done"     echo "done"
  
     echo -n "Removing links to scripts..."     echo -n "Removing links to scripts..."
Line 64  if ($CHKLIBS == "no") then
Line 70  if ($CHKLIBS == "no") then
     endif     endif
     echo "done"     echo "done"
  
       echo -n "Removing links to third-party libraries..."
       if (-d lib_third_party) then
           rm -rf lib_third_party
       endif
       echo "done"
   
     echo     echo
  
     if ($CLEAN == "yes") then     if ($CLEAN == "yes") then
Line 108  if ($CHKLIBS == "no") then
Line 120  if ($CHKLIBS == "no") then
         cd base/include         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" \; \)         find .. -path '../include' -prune -o -name \*.h  \( \( -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \; \)
         cd ../..         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 "done"
         echo         echo
  
Line 144  if ($CHKLIBS == "no") then
Line 165  if ($CHKLIBS == "no") then
         cd ..         cd ..
         echo "done"         echo "done"
         echo         echo
           # Set links to third-party libraries
           echo "Setting links to third-party libraries"
           if (!(-d lib_third_party)) then
               mkdir lib_third_party
           endif
           cd lib_third_party
   
           if (-e ../suflag.txt) then
               ln -sfv /home/jsoc/include include
               ln -sfv /home/jsoc/lib lib
           else
   # Non-Stanford users: edit these lines to reflect the location of required
   #  3rd party libs: cfitsio.a
               ln -sfv /usr/local/include include
               ln -sfv /usr/local/lib lib
           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/libfftw3f.a)) then
                       echo "Can't find required library: <JSOCROOT>/lib/linux_x86_64/libfftw3f.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: <JSOCROOT>/lib/linux_ia32/libfftw3f.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: <JSOCROOT>/lib/mac_osx/libfftw3f.a"
                       set TPWARN = 1
                   endif
               endif
           else
               # Non-Stanford users' required libs.
           endif
   
           if ($TPWARN) then
               echo "Did you update <JSOCROOT>/configure to create links to installed third-party libraries?"
           endif
   
           cd ..
           echo "done"
           echo
  
         # generate links for DSDS/SOI dynamic libraries - only do this if         # generate links for DSDS/SOI dynamic libraries - only do this if
         # user's environment has access to /home/soi/CM         # user's environment has access to /home/soi/CM


Legend:
Removed from v.1.13  
changed lines
  Added in v.1.22

Karen Tian
Powered by
ViewCVS 0.9.4