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

Diff for /JSOC/configure between version 1.34 and 1.46

version 1.34, 2009/01/29 18:55:44 version 1.46, 2009/04/21 00:42:01
Line 21  end
Line 21  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..."
     if (-d proj) then      rm -f proj/configure proj/make_basic.mk proj/Rules.mk proj/target.mk
         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
         cd base/include          find base/include -name "*.h" -exec rm {} \;
         find . -name "*.h" -exec rm {} \;  
         cd ../..  
     endif     endif
  
     if (-d include) then     if (-d include) then
         cd include          find include -name "*.h" -exec rm {} \;
         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
         cd scripts          find scripts -name "*" -exec rm {} \;
         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
         cd jsds          find jsds -name "*" -exec rm {} \;
         find . -name "*" -exec rm {} \;  
         cd ..  
     endif     endif
     echo "done"     echo "done"
  
Line 126  if ($CHKLIBS == "no") then
Line 101  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 138  if ($CHKLIBS == "no") then
Line 111  if ($CHKLIBS == "no") then
         echo         echo
  
         echo "Setting links to scripts..."         echo "Setting links to scripts..."
         if (!(-d scripts)) then          mkdir -p scripts
             mkdir scripts  
         endif  
         cd scripts         cd scripts
  
         # Sums scripts         # Sums scripts
Line 162  if ($CHKLIBS == "no") then
Line 133  if ($CHKLIBS == "no") then
         echo         echo
  
         echo "Setting links to jsds..."         echo "Setting links to jsds..."
         if (!(-d jsds)) then          if (!(-d jsds))  mkdir jsds
             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 172  if ($CHKLIBS == "no") then
Line 141  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)) then          if (!(-d lib_third_party)) mkdir lib_third_party
             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)) then              if (!(-d include)) mkdir include
                 mkdir include  
             endif  
  
             if (!(-d lib)) then              if (!(-d lib)) mkdir lib
                 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 197  if ($CHKLIBS == "no") then
Line 160  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)) then              if (!(-d linux_x86_64)) mkdir linux_x86_64
                 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)) then              if (!(-d linux_ia32)) mkdir linux_ia32
                 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 {} \;
             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 332  endif
Line 217  endif
 if ($CHKLIBS == "yes") then if ($CHKLIBS == "yes") then
  
     echo     echo
     echo "JSOC expects all third-party library header files to be located at $JSOCROOT/lib_third_party/include/ and all third-party libraries to be located at $JSOCROOT/lib_third_party/$JSOC_MACHINE/.  If you wish to build a target that uses one of the following third-paty libraries, please install the required library version and create a link from from $JSOCROOT/lib_third_party/include/ and $JSOCROOT/lib_third_party/$JSOC_MACHINE/ to the installed library headers and binary files, respectively."    echo "JSOC expects all third-party library header files to be located at"
     echo "         $JSOCROOT/lib_third_party/include/"
     echo "     and all third-party libraries to be located at
     echo "         $JSOCROOT/lib_third_party/$JSOC_MACHINE/"
     echo "     If you wish to build a target that uses one of the following"
     echo "     third-party libraries, please install the required library version"
     echo "     and create a link from from"
     echo "         $JSOCROOT/lib_third_party/include/"
     echo "     and $JSOCROOT/lib_third_party/$JSOC_MACHINE/"
     echo "     to the installed library headers and binary files, respectively."
     echo     echo
     echo "Example:"     echo "Example:"
     echo "  cd $JSOCROOT/lib_third_party/"     echo "  cd $JSOCROOT/lib_third_party/"
Line 353  if ($CHKLIBS == "yes") then
Line 247  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 "Error: config.local not found. If you have a saved version of this"
       echo "       file from a previous installation, you should copy that into"
       echo "       this directory and rerun configure. Otherwise, copy the file"
       echo "       config.local.template to config.local and edit the config.local"
       echo "       file to contain site-appropriate values."
       echo
       echo "*** IMPORTANT *** The edited config.local will contain site-specific"
       echo "    values that should not be modified during subsequent updates to"
       echo "    NetDRMS. Keep a safe copy of it somewhere outside of the DRMS"
       echo "    directory tree, for example in /usr/local. After each NetDRMS"
       echo "    update, ensure this file is in place."
     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 (!(-e "lib_third_party/lib/$JSOC_MACHINE/libcfitsio.a")) then
       echo
       echo "Can't find required library: lib_third_party/lib/$JSOC_MACHINE/libcfitsio.a"
       set TPWARN = 1
   endif
   
   # special required libraries for particular architectures
   
   if (-e ../suflag.txt) then
   # Stanford users' required libs.
   
       if (!(-e "lib_third_party/lib/$JSOC_MACHINE/libfftw3f.a")) then
           echo
           echo "Can't find required library: lib_third_party/lib/$JSOC_MACHINE/libfftw3f.a"
           set TPWARN = 1
       endif
   
   # special required libraries for particular architectures
       if ($JSOC_MACHINE == "linux_x86_64") then
           if (!(-e lib_third_party/lib/linux_x86_64/libcfitsio_gcc.a)) then
               echo
               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/libgsl.a)) then
               echo
               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
               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/libgsl.a)) then
               echo
               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
               echo "Can't find required library: lib_third_party/lib/linux_ia32/libgslcblas.a"
               set TPWARN = 1
           endif
       endif
   
       if ($JSOC_MACHINE == "mac_osx_ppc") then
       endif
   
       if ($JSOC_MACHINE == "mac_osx_ia32") then
       endif
   endif
   
   if ($TPWARN) then
       echo "Did you update config.local to create links to installed third-party libraries?"
   endif
   
   foreach CCTST (icc gcc cc)
     set CCC = `which $CCTST`
     if ($status) continue
     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
   

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