X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=bootstrap.fink;h=b188d4eb1e121880cd9a0b247cf61311dc50383b;hb=aa4c3c946369afeb6f71fc02c52ced313ac52839;hp=9570feb14a7ddb5e465ebf6f43329feca2bfe4c7;hpb=06afff1a4dad5e04d5256f1dbfe55da728f71737;p=chise%2Fchise-base.git

diff --git a/bootstrap.fink b/bootstrap.fink
index 9570feb..b188d4e 100755
--- a/bootstrap.fink
+++ b/bootstrap.fink
@@ -1,34 +1,40 @@
 #!/bin/sh
 
-fink install compface-dev
-fink install libpng3
+fink install libpng14
 fink install libtiff
-fink install libjpeg
-fink install db48
+fink install libjpeg8
+fink install db51
 fink install xaw3d
 fink install libncurses5
 fink install x11-dev
-fink install canna-dev
+
+canna_is_not_found=`fink install canna-dev | grep "Failed: no package found for specification 'canna-dev'"`
+if [ "s${canna_is_not_found}" = "s" ]
+then
+    fink install canna-shlibs
+    canna_opts='--with-canna'
+else
+    canna_opts=''
+fi
 
 fink install x11
+fink install compface-dev
 fink install compface-shlibs
-fink install libpng3-shlibs
+fink install libpng14-shlibs
 fink install libtiff-shlibs
-fink install libjpeg-shlibs
-fink install db48-shlibs
+fink install libjpeg8-shlibs
+fink install db51-shlibs
 fink install xaw3d-shlibs
 fink install ncurses
 fink install libncurses5-shlibs
-fink install canna-shlibs
 
 #fink install coreutils-default
 fink install wget
 fink install unzip
 
 ./configure \
-    --with-site-includes=/sw/include/db4:/sw/include \
-    --with-site-libraries=/sw/lib \
-    --with-canna
+    --with-site-includes=/sw/include/db5:/sw/include \
+    --with-site-libraries=/sw/lib ${canna_opts}
 
 ulimit -n 2048
 
@@ -36,5 +42,4 @@ make -e SUDO=sudo install-base
 
 cd chise-fonts-installer/TrueType && make build-arphic \
     && sudo make install-arphic
-
-cd chise-fonts-installer/TrueType/Hanazono/ && sudo make install-mac
+sudo make install-mac