+++ /dev/null
-have_library: checking for main() in -lGL... -------------------- no
-
-<<<<<<< HEAD
-"gcc -o conftest -I/usr/local/include/ruby-1.9.1/x86_64-linux -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include -O3 -ggdb -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration conftest.c -L. -L/usr/local/lib -Wl,-R/usr/local/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L. -rdynamic -Wl,-export-dynamic -Wl,-R -Wl,/usr/local/lib -L/usr/local/lib -lruby-static -lpthread -lrt -ldl -lcrypt -lm -lc"
-/usr/local/lib/ruby/1.9.1/mkmf.rb:317: warning: Insecure world writable dir /net/fs08/workFS08 in PATH, mode 040777
-=======
-"xcrun cc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin12.0 -I. -I/Applications/Eos.app/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common conftest.c -L. -L/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib -L/usr/lib -L/Applications/Eos.app/Eos/lib/X86MAC64 -L/Applications/Eos.app/Eos/util/X86MAC64/lib -L. -arch i386 -arch x86_64 -lruby -lGL -lpthread -ldl -lobjc "
-dyld: Symbol not found: __cg_TIFFClientOpen
- Referenced from: /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
- Expected in: /Applications/Eos.app/Eos/util/X86MAC64/lib/libTIFF.dylib
- in /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
-xcrun: error: unable to locate xcodebuild, please make sure the path to the Xcode folder is set correctly!
-xcrun: error: You can set the path to the Xcode folder using /usr/bin/xcode-select -switch
->>>>>>> FETCH_HEAD
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2:
-3: int main() {return 0;}
-/* end */
-
-<<<<<<< HEAD
-"gcc -o conftest -I/usr/local/include/ruby-1.9.1/x86_64-linux -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include -O3 -ggdb -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration conftest.c -L. -L/usr/local/lib -Wl,-R/usr/local/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L. -rdynamic -Wl,-export-dynamic -Wl,-R -Wl,/usr/local/lib -L/usr/local/lib -lruby-static -lGL -lpthread -lrt -ldl -lcrypt -lm -lc"
-/usr/bin/ld: cannot find -lGL
-collect2: ld はステータス 1 で終了しました
-=======
-"xcrun cc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin12.0 -I. -I/Applications/Eos.app/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common conftest.c -L. -L/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib -L/usr/lib -L/Applications/Eos.app/Eos/lib/X86MAC64 -L/Applications/Eos.app/Eos/util/X86MAC64/lib -L. -arch i386 -arch x86_64 -lruby -lGL -lpthread -ldl -lobjc "
-dyld: Symbol not found: __cg_TIFFClientOpen
- Referenced from: /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
- Expected in: /Applications/Eos.app/Eos/util/X86MAC64/lib/libTIFF.dylib
- in /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
-xcrun: error: unable to locate xcodebuild, please make sure the path to the Xcode folder is set correctly!
-xcrun: error: You can set the path to the Xcode folder using /usr/bin/xcode-select -switch
->>>>>>> FETCH_HEAD
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2:
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
-/* end */
-
-"gcc -o conftest -I/usr/local/include/ruby-1.9.1/x86_64-linux -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -I. -I/home/people/tacyas/Eos/include -O3 -ggdb -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration conftest.c -L. -L/usr/local/lib -Wl,-R/usr/local/lib -L/usr/lib -Wl,-R/usr/lib -L/home/people/tacyas/Eos/lib/X86LINUX64 -Wl,-R/home/people/tacyas/Eos/lib/X86LINUX64 -L/home/people/tacyas/Eos/util/X86LINUX64/lib -Wl,-R/home/people/tacyas/Eos/util/X86LINUX64/lib -L. -rdynamic -Wl,-export-dynamic -Wl,-R -Wl,/usr/local/lib -L/usr/local/lib -lruby-static -lGL -lpthread -lrt -ldl -lcrypt -lm -lc"
-/usr/bin/ld: cannot find -lGL
-collect2: ld はステータス 1 で終了しました
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2:
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { main(); return 0; }
-/* end */
-
---------------------
-
+++ /dev/null
- modified: mrcImageFractalFourierShellCorrelation.c
- modified: pdbListRMSDCalc.c
-#
-# Changed but not updated:
-# (use "git add/rm <file>..." to update what will be committed)
-# (use "git checkout -- <file>..." to discard changes in working directory)
-#
-# deleted: :q
-# deleted: Eos
-# deleted: bin/wish/ctfDisplay/.nfs00000000089206620000003e
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/.nfs000000000007cd3300000007
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/geogeoge
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/itami
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/kayabuki
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/konson3
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/kuma
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/miho2
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/myo
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/reoleo
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/ryuuhaku
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/takahiro
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/watanabe2009
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/yajinori
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/yamashita09
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/yoshinori
-# deleted: hostdepend/X86LINUX64/bin/X86LINUX64/yoshio
-# deleted: hostdepend/X86LINUX64/src/Objects/DataExpress/openGL/src/X86LINUX64/SDLmolvieEvent.sharedo
-# deleted: hostdepend/X86LINUX64/src/Objects/General/Raw/src/X86LINUX64/lib.a
-# deleted: hostdepend/X86LINUX64/src/Tools/Integration/StereoDisplay/src/X86LINUX64/.Depend
-# deleted: hostdepend/X86LINUX64/src/Tools/Test/cufft/src/X86LINUX64/cufft
-# deleted: hostdepend/X86LINUX64/src/Tools/admin/mallocCheck/src/X86LINUX64/.Depend
-# deleted: hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageCorrelationWithCTFCompensation/src/X86LINUX64/.Depend
-# deleted: hostdepend/X86LINUX64/util/X86LINUX64/lib/.nfs00000000089a342c00000044
-# deleted: hostdepend/X86LINUX64/util/X86LINUX64/lib/.nfs00000000089a342e00000045
-# deleted: hostdepend/X86LINUX64ICC/src/Tools/Integration/StereoDisplay/src/X86LINUX64ICC/.Depend
-# deleted: hostdepend/X86LINUX64ICC/src/Tools/admin/mallocCheck/src/X86LINUX64ICC/.Depend
-# deleted: hostdepend/X86LINUX64ICC/src/Tools/mrcImage/mrcImageCorrelationWithCTFCompensation/src/X86LINUX64ICC/.Depend
-# deleted: include/mrcImageAutoRotationCorrelation.h
-# deleted: include/mrcImageAutoRotationCorrelationResultPrint.h
-# deleted: src/Objects/DataManip/transform/src/:q
-# deleted: src/Objects/DataManip/transform/src/:w
-# deleted: src/Tools/Config/#%2Amerge%2A#16143LXY#
-# deleted: src/Tools/Test/cufft/src/cufft.c
-# deleted: src/Tools/Test/cufft/src/cufft.cu.backup
-# deleted: src/Tools/mrcImage/mrcImage3DWindowing/src/mrcImage3DWindowing.c.20090604062120
-# deleted: src/Tools/mrcImage/mrcImageAutoRotationCorrelation3D/src/test.err
-# deleted: src/Tools/mrcImage/mrcImageAverage/src/.mrcImageAverage.c.swp
-# deleted: src/Tools/mrcImage/mrcImageFFT/src/test/test.log
-# deleted: "src/Tools/mrcImage/mrcImageModelCreate/src/\b"
-# deleted: src/Tools/mrcImage/mrcImageModelCreate/src/1mys.pdb
-# deleted: src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.c.org
-# deleted: src/Tools/mrcImage/mrcImageModelCreate/src/sample.mrc
-# deleted: src/Tools/mrcImage/mrcInfo/src/test.mrc
-# deleted: src/Tools/vectorImage/vectorImageNearestNeighborMethod/src/vectorImageNearestNeighborMethod.cc
-# deleted: "\177"
-#