*** configure.orig Mon May 11 09:34:42 2009 --- configure Wed Jun 3 19:59:05 2009 *************** *** 9,16 **** value=`echo $arg | cut -d "=" -f 2` case $name in ! --with-headers) include_path=$include_path $value ;; ! --with-libraries) library_path=$library_path $value ;; --help) echo "configure options:" echo "--help" echo " display this information" --- 9,16 ---- value=`echo $arg | cut -d "=" -f 2` case $name in ! --with-headers) include_path=$value ;; ! --with-libraries) library_path=$value ;; --help) echo "configure options:" echo "--help" echo " display this information" *************** *** 23,54 **** done # Boost C++ Librariesのヘッダファイルがあるディレクトリをサーチ ! for dir in $include_path "/usr/local/include" "/opt/local/include" "/opt/include" "/usr/include" ! do ! ls $dir/boost* 2> /dev/null > /dev/null ! if test $? -eq 0 ! then ! boost_dir=`ls -d $dir/boost* | sort -r | head -1` ! if test '$boost_dir' == '$dir/boost' then ! include_path=$dir ! else ! include_path=$boost_dir fi ! break ! fi ! done # Boost C++ Librariesのライブラリファイルがあるディレクトリをサーチ ! for dir in $library_path "/usr/local/lib" "/opt/local/lib" "/opt/lib" "/usr/lib" "/lib" ! do ! ls $dir/libboost* 2> /dev/null > /dev/null ! if test $? -eq 0 ! then ! library_path=$dir ! break ! fi ! done ##### 以下、Makefile.configを生成する ##### --- 23,60 ---- done # Boost C++ Librariesのヘッダファイルがあるディレクトリをサーチ ! if test -z $include_path ! then ! for dir in "/usr/local/include" "/opt/local/include" "/opt/include" "/usr/include" ! do ! ls $dir/boost* 2> /dev/null > /dev/null ! if test $? -eq 0 then ! boost_dir=`ls -d $dir/boost* | sort -r | head -1` ! if test '$boost_dir' == '$dir/boost' ! then ! include_path=$dir ! else ! include_path=$boost_dir ! fi ! break fi ! done ! fi # Boost C++ Librariesのライブラリファイルがあるディレクトリをサーチ ! if test -z $library_path ! then ! for dir in "/usr/local/lib" "/opt/local/lib" "/opt/lib" "/usr/lib" "/lib" ! do ! ls $dir/libboost* 2> /dev/null > /dev/null ! if test $? -eq 0 ! then ! library_path=$dir ! break ! fi ! done ! fi ##### 以下、Makefile.configを生成する ##### *************** *** 74,80 **** # Boost C+ Libraries 1.34以上なら、libboost_system*をリンクする必要あり if test $boost_version -ge 103400 then ! echo "BOOST_LIBFILES = -lboost_system\$(LIBBOOST_SUFFIX)" >> $makefile_config fi # 各種変数を出力 --- 80,89 ---- # Boost C+ Libraries 1.34以上なら、libboost_system*をリンクする必要あり if test $boost_version -ge 103400 then ! if test -f $library_path/libboost_system$libboost_suffix.a ! then ! echo "BOOST_LIBFILES = -lboost_system$libboost_suffix" >> $makefile_config ! fi fi # 各種変数を出力