--- ./applications/Makefile.org 2005-07-19 02:02:14.000000000 +0900 +++ ./applications/Makefile 2005-10-27 00:51:03.000000000 +0900 @@ -1,8 +1,13 @@ include ../config.mak -APPDIRS=mp4box mp4client mp42avi generators osmozilla +APPDIRS=mp4box mp4client mp42avi generators V4STUDIODIR= -INSTDIRS=mp4client osmozilla +INSTDIRS=mp4client + +ifneq ($(CONFIG_JS), no) +APPDIRS+=osmozilla +INSTDIRS+osmozilla +endif ifeq ($(USE_WXWIDGETS), yes) APPDIRS+=osmo4_wx --- ./configure.org 2005-08-03 18:55:39.000000000 +0900 +++ ./configure 2005-10-27 00:15:02.000000000 +0900 @@ -220,11 +220,7 @@ Darwin) js_flags=-DXP_MAC -if test -d /sw/bin ; then - alt_macosx_dir="/sw" - CFLAGS="-I/sw/include" - LDFLAGS="-L/sw/lib" -elif test -d /opt/local/bin ; then +if test -d /opt/local/bin ; then alt_macosx_dir="/opt/local" CFLAGS="-I/opt/local/include" LDFLAGS="-L/opt/local/lib" @@ -652,15 +648,15 @@ ;; --use-ft=*) has_ft=${opt#--use-ft=} ;; - --use-mad=*) has_mad==${opt#--use-mad=} + --use-mad=*) has_mad=${opt#--use-mad=} ;; - --use-xvid=*) has_xvid==${opt#--use-xvid=} + --use-xvid=*) has_xvid=${opt#--use-xvid=} ;; - --use-jpeg=*) has_jpeg==${opt#--use-jpeg=} + --use-jpeg=*) has_jpeg=${opt#--use-jpeg=} ;; - --use-ffmpeg=*) has_ffmpeg==${opt#--use-ffmpeg=} + --use-ffmpeg=*) has_ffmpeg=${opt#--use-ffmpeg=} ;; - --use-png=*) has_png==${opt#--use-png=} + --use-png=*) has_png=${opt#--use-png=} ;; esac done