diff --git a/science/silo/Makefile b/science/silo/Makefile index 4e92518570d8..dd28a56ca1dc 100644 --- a/science/silo/Makefile +++ b/science/silo/Makefile @@ -28,16 +28,17 @@ USE_XLIB= yes USE_QT_VER= 3 QT_COMPONENTS= moc uic -OPTIONS= PYTHON "Enable Python Module" On \ +OPTIONS= PYTHON "Enable Python Module" Off \ HDF5 "Enable HDF5 Driver" Off \ - BROWSER "Enable Silex Browser" Off \ + SILEXB "Enable Silex Browser" Off \ FORTRAN "Compile Fortran interface" Off \ OPTIMIZATION "Enable extra optimizations" On +USE_PYTHON= yes + .include .ifdef WITH_PYTHON -USE_PYTHON= yes CONFIGURE_ARGS+= --enable-pythonmodule PLIST_SUB+= WITH_PYTHON="" .else @@ -54,11 +55,11 @@ PLIST_SUB+= WITH_HDF5="@comment " PLIST_SUB+= WITH_NCDF="" .endif -.ifdef WITH_BROWSER +.ifdef WITH_SILEXB CONFIGURE_ARGS+= --enable-silex -PLIST_SUB+= WITH_BROWSER="" +PLIST_SUB+= WITH_SILEXB="" .else -PLIST_SUB+= WITH_BROWSER="@comment " +PLIST_SUB+= WITH_SILEXB="@comment " .endif .ifdef WITH_FORTRAN diff --git a/science/silo/pkg-plist b/science/silo/pkg-plist index 48a489b9e50f..c3ecbd8846ae 100644 --- a/science/silo/pkg-plist +++ b/science/silo/pkg-plist @@ -1,4 +1,4 @@ -%%WITH_BROWSER%%bin/browser +%%WITH_SILEXB%%bin/browser bin/silodiff bin/silex bin/silock