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

Diff for /JSOC/configure between version 1.46 and 1.48

version 1.46, 2009/04/21 00:42:01 version 1.48, 2009/06/05 21:03:51
Line 1 
Line 1 
 #! /bin/csh -f #! /bin/csh -f
  
   rm custom.mk
   
 # set up $JSOC_MACHINE # set up $JSOC_MACHINE
 set JSOC_MACHINE = `build/jsoc_machine.csh` set JSOC_MACHINE = `build/jsoc_machine.csh`
 echo "Machine type is $JSOC_MACHINE" echo "Machine type is $JSOC_MACHINE"
Line 21  end
Line 23  end
  
 if ($CHKLIBS == "no") then if ($CHKLIBS == "no") then
     echo -n "Remove links for local project configuration..."     echo -n "Remove links for local project configuration..."
     rm -f proj/configure proj/make_basic.mk proj/Rules.mk proj/target.mk      if (-d proj) then
           cd proj
           if (-e configure) then
               rm configure
           endif
           if (-e make_basic.mk) then
               rm make_basic.mk
           endif
           if (-e Rules.mk) then
               rm Rules.mk
           endif
           if (-e target.mk) then
               rm target.mk
           endif
           cd ..
       endif
     echo "done"     echo "done"
  
     echo -n "Remove links to man pages..."     echo -n "Remove links to man pages..."
       if (-e man) then
     rm -rf man     rm -rf man
       endif
     echo "done"     echo "done"
  
     echo -n "Removing links to headers..."     echo -n "Removing links to headers..."
     if (-d base/include) then     if (-d base/include) then
         find base/include -name "*.h" -exec rm {} \;          cd base/include
           find . -name "*.h" -exec rm {} \;
           cd ../..
     endif     endif
  
     if (-d include) then     if (-d include) then
         find include -name "*.h" -exec rm {} \;          cd include
           find . -name "*.h" -exec rm {} \;
           cd ..
     endif     endif
     echo "done"     echo "done"
  
     echo -n "Removing links to scripts..."     echo -n "Removing links to scripts..."
     if (-d scripts) then     if (-d scripts) then
         find scripts -name "*" -exec rm {} \;          cd scripts
           find . -name "*" -exec rm {} \;
           cd ..
     endif     endif
     echo "done"     echo "done"
  
     echo -n "Removing links to jsds..."     echo -n "Removing links to jsds..."
     if (-d jsds) then     if (-d jsds) then
         find jsds -name "*" -exec rm {} \;          cd jsds
           find . -name "*" -exec rm {} \;
           cd ..
     endif     endif
     echo "done"     echo "done"
  
Line 101  if ($CHKLIBS == "no") then
Line 128  if ($CHKLIBS == "no") then
         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         mkdir -p include
           endif
         cd include         cd include
         if (-d ../base/include) then         if (-d ../base/include) then
             find ../base/include -name \*.h -exec ln -s {} . \;             find ../base/include -name \*.h -exec ln -s {} . \;
Line 111  if ($CHKLIBS == "no") then
Line 140  if ($CHKLIBS == "no") then
         echo         echo
  
         echo "Setting links to scripts..."         echo "Setting links to scripts..."
         mkdir -p scripts          if (!(-d scripts)) then
               mkdir scripts
           endif
         cd scripts         cd scripts
  
         # Sums scripts         # Sums scripts
Line 133  if ($CHKLIBS == "no") then
Line 164  if ($CHKLIBS == "no") then
         echo         echo
  
         echo "Setting links to jsds..."         echo "Setting links to jsds..."
         if (!(-d jsds))  mkdir jsds          if (!(-d jsds)) then
               mkdir jsds
           endif
         cd jsds         cd jsds
         find ../base \( -name \*.jsd -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o \( -name \*.jsd -exec echo "  " {} " ERROR - couldn't create link" \; \)         find ../base \( -name \*.jsd -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o \( -name \*.jsd -exec echo "  " {} " ERROR - couldn't create link" \; \)
         cd ..         cd ..
Line 141  if ($CHKLIBS == "no") then
Line 174  if ($CHKLIBS == "no") then
         echo         echo
         # Set links to third-party libraries         # Set links to third-party libraries
         echo "Setting links to third-party libraries"         echo "Setting links to third-party libraries"
         if (!(-d lib_third_party)) mkdir lib_third_party          if (!(-d lib_third_party)) then
               mkdir lib_third_party
           endif
         cd lib_third_party         cd lib_third_party
  
         if (-e ../suflag.txt) then         if (-e ../suflag.txt) then
             if (!(-d include)) mkdir include              if (!(-d include)) then
                   mkdir include
               endif
  
             if (!(-d lib)) mkdir lib              if (!(-d lib)) then
                   mkdir lib
               endif
  
             # Don't make a link directly from include/lib to a directory, else             # Don't make a link directly from include/lib to a directory, else
             # all includes files/libs must reside in one directory.             # all includes files/libs must reside in one directory.
Line 160  if ($CHKLIBS == "no") then
Line 199  if ($CHKLIBS == "no") then
  
             cd lib             cd lib
             # Standard locations for all of JSOC's libraries - x86_64             # Standard locations for all of JSOC's libraries - x86_64
             if (!(-d linux_x86_64)) mkdir linux_x86_64              if (!(-d linux_x86_64)) then
                   mkdir linux_x86_64
               endif
  
             cd linux_x86_64             cd linux_x86_64
                 find /home/jsoc/lib/linux_x86_64/ -maxdepth 1 -name "*.a" -exec ln -sfv {} \;                 find /home/jsoc/lib/linux_x86_64/ -maxdepth 1 -name "*.a" -exec ln -sfv {} \;
             cd ..             cd ..
  
             # Standard locations for all of JSOC's libraries - ia32             # Standard locations for all of JSOC's libraries - ia32
             if (!(-d linux_ia32)) mkdir linux_ia32              if (!(-d linux_ia32)) then
                   mkdir linux_ia32
               endif
  
             cd linux_ia32             cd linux_ia32
                 find /home/jsoc/lib/linux_ia32/ -maxdepth 1 -name "*.a" -exec ln -sfv {} \;                 find /home/jsoc/lib/linux_ia32/ -maxdepth 1 -name "*.a" -exec ln -sfv {} \;
Line 187  if ($CHKLIBS == "no") then
Line 230  if ($CHKLIBS == "no") then
         # Set custom make file to tell the make system that the gcc cfitsio library is called         # Set custom make file to tell the make system that the gcc cfitsio library is called
         # libcfitsio_gcc.a         # libcfitsio_gcc.a
         if (-e suflag.txt) then         if (-e suflag.txt) then
             echo "CFITSIOFNAME_GCC_X86_64 = cfitsio_gcc" > custom.mk              echo "CFITSIOFNAME_GCC_X86_64 = cfitsio_gcc" >> custom.mk
         endif         endif
  
         # Make customizations - ensure changes here are synchronized to changes in make_basic.mk         # Make customizations - ensure changes here are synchronized to changes in make_basic.mk
Line 272  endif
Line 315  endif
 set TPWARN = 0 set TPWARN = 0
  
 # Libraries required by all # Libraries required by all
 if (!(-e "lib_third_party/lib/$JSOC_MACHINE/libcfitsio.a")) then  if ($JSOC_MACHINE == "linux_x86_64") then
       if (!(-e lib_third_party/lib/linux_x86_64/libcfitsio.a)) then
     echo     echo
     echo "Can't find required library: lib_third_party/lib/$JSOC_MACHINE/libcfitsio.a"          echo "Can't find required library: lib_third_party/lib/linux_x86_64/libcfitsio.a"
     set TPWARN = 1     set TPWARN = 1
 endif endif
   endif
  
 # special required libraries for particular architectures  if ($JSOC_MACHINE == "linux_ia32") then
       if (!(-e lib_third_party/lib/linux_ia32/libcfitsio.a)) then
 if (-e ../suflag.txt) then          echo
 # Stanford users' required libs.          echo "Can't find required library: lib_third_party/lib/linux_ia32/libcfitsio.a"
           set TPWARN = 1
       endif
   endif
  
     if (!(-e "lib_third_party/lib/$JSOC_MACHINE/libfftw3f.a")) then  if ($JSOC_MACHINE == "mac_osx") then
       if (!(-e lib_third_party/lib/mac_osx/libcfitsio.a)) then
         echo         echo
         echo "Can't find required library: lib_third_party/lib/$JSOC_MACHINE/libfftw3f.a"          echo "Can't find required library: lib_third_party/lib/mac_osx/libcfitsio.a"
         set TPWARN = 1         set TPWARN = 1
     endif     endif
   endif
  
 # special required libraries for particular architectures  if (-e ../suflag.txt) then
       # Stanford users' required libs.
     if ($JSOC_MACHINE == "linux_x86_64") then     if ($JSOC_MACHINE == "linux_x86_64") then
         if (!(-e lib_third_party/lib/linux_x86_64/libcfitsio_gcc.a)) then         if (!(-e lib_third_party/lib/linux_x86_64/libcfitsio_gcc.a)) then
             echo             echo
             echo "Can't find required library: lib_third_party/lib/linux_x86_64/libcfitsio_gcc.a"             echo "Can't find required library: lib_third_party/lib/linux_x86_64/libcfitsio_gcc.a"
             set TPWARN = 1             set TPWARN = 1
         endif         endif
           if (!(-e lib_third_party/lib/linux_x86_64/libfftw3f.a)) then
               echo
               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         if (!(-e lib_third_party/lib/linux_x86_64/libgsl.a)) then
             echo             echo
             echo "Can't find required library: lib_third_party/lib/linux_x86_64/libgsl.a"             echo "Can't find required library: lib_third_party/lib/linux_x86_64/libgsl.a"
Line 309  if (-e ../suflag.txt) then
Line 365  if (-e ../suflag.txt) then
     endif     endif
  
     if ($JSOC_MACHINE == "linux_ia32") then     if ($JSOC_MACHINE == "linux_ia32") then
           if (!(-e lib_third_party/lib/linux_ia32/libfftw3f.a)) then
               echo
               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         if (!(-e lib_third_party/lib/linux_ia32/libgsl.a)) then
             echo             echo
             echo "Can't find required library: lib_third_party/lib/linux_ia32/libgsl.a"             echo "Can't find required library: lib_third_party/lib/linux_ia32/libgsl.a"
Line 321  if (-e ../suflag.txt) then
Line 382  if (-e ../suflag.txt) then
         endif         endif
     endif     endif
  
     if ($JSOC_MACHINE == "mac_osx_ppc") then      if ($JSOC_MACHINE == "mac_osx") then
           if (!(-e lib_third_party/lib/mac_osx/libfftw3f.a)) then
               echo
               echo "Can't find required library: lib_third_party/lib/mac_osx/libfftw3f.a"
               set TPWARN = 1
     endif     endif
   
     if ($JSOC_MACHINE == "mac_osx_ia32") then  
     endif     endif
 endif endif
  
Line 332  if ($TPWARN) then
Line 395  if ($TPWARN) then
     echo "Did you update config.local to create links to installed third-party libraries?"     echo "Did you update config.local to create links to installed third-party libraries?"
 endif endif
  
 foreach CCTST (icc gcc cc)  # Customize compilers
   set CCC = `which $CCTST`  # echo "CUSTOM_COMPILER = gcc" >> custom.mk
   if ($status) continue  # echo "CUSTOM_FCOMPILER = gfortran" >> custom.mk
   echo "COMPILER = $CCC" >> custom.mk  
   break  
 end  
   
 foreach CCTST (ifort gfortran g95)  
   set CCC = `which $CCTST`  
   if ($status) continue  
   echo "F77 = $CCC" >> custom.mk  
   break  
 end  
   
 if (-e config.local) then  
   set PGPTH = `grep "^POSTGRES_INCS" config.local | awk '{print $2}'`  
   echo "PGIPATH = $PGPTH" >> custom.mk  
 endif  
   
 # 2009/03/23 : jhourcle : fixing logic errors / simplifying code  
 # 2009/04/08 : jhourcle : cleaning up compiler assignment logic  
 # 2009/04/20 : rbogart : additional simplification  
  
   # run perl script to do even more configuration
   moreconfigure.pl -fcustom.mk

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