bee-init: fix a bug when DEFAULT_CONFIGURE_OPTIONS where set

uncomment mee_configure if default configure options are set
mariux64 · Mar 23, 2012 · 735f029 · 735f029
1 parent a635790
commit 735f029
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/conf/templates/fallback b/conf/templates/fallback
@@ -24,9 +24,9 @@ PATCHURL[0]=""
 #    bee_patch ${@}
 #}
 
-#mee_configure() {
-#    bee_configure @DEFAULT_CONFIGURE_OPTIONS@
-#}
+@DEFAULT_CONFIGURE_OPTIONS_NOTSET@mee_configure() {
+@DEFAULT_CONFIGURE_OPTIONS_NOTSET@    bee_configure @DEFAULT_CONFIGURE_OPTIONS@
+@DEFAULT_CONFIGURE_OPTIONS_NOTSET@}
 
 #mee_build() {
 #    bee_build

diff --git a/src/bee-init.sh.in b/src/bee-init.sh.in
@@ -227,7 +227,14 @@ function initialize() {
     sed -e "s,@SRCURL@,SRCURL[0]=\"${surl}\"," \
         -i ${beefile}
 
+    if [ -z "${DEFAULT_CONFIGURE_OPTIONS}" ] ; then
+        DEFAULT_CONFIGURE_OPTIONS_NOTSET="#"
+    else
+        DEFAULT_CONFIGURE_OPTIONS_NOTSET=""
+    fi
+
     sed -e "s,@DEFAULT_CONFIGURE_OPTIONS@,${DEFAULT_CONFIGURE_OPTIONS}," \
+        -e "s,@DEFAULT_CONFIGURE_OPTIONS_NOTSET@,${DEFAULT_CONFIGURE_OPTIONS_NOTSET}," \
         -i ${beefile}
 
     for i in prefix eprefix bindir sbindir libexecdir sysconfdir \