X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fpkg%2Fgettext;h=902439f53f404d63c5fa6388e0a54cf53a7ec76b;hb=0fefb94d78f31fdf9a469a14711dccf2f8ac0141;hp=7bcd57a0422168976e5c15b85c1d9342f221823a;hpb=b5bfb2006502b57fab234345a2393fd04e6d55ad;p=hvlinux.git

diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext
index 7bcd57a..902439f 100644
--- a/stage1/pkg/gettext
+++ b/stage1/pkg/gettext
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-CONFIGURE_OPTS="\
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    ${CONFIGURE_OPTS}"
+hvconfig_pre()
+{
+    CONFIGURE_OPTS+=" --disable-shared"
+}
 
 # When cross-compiling the Gettext configure script assumes we don't have a
 # working wcwidth when we do. The following will fix possible compilation
@@ -19,12 +18,7 @@ EOF
 hvconfig()
 {
     cd ${LFS_TMP}/${PACKAGE}/gettext-tools
-
-    echo "Running configure with options:"
-    echo "  <${CONFIGURE_OPTS}>"
-
-    CC="${CC} ${CLFS_BUILDFLAGS}" CXX="${CXX} ${CLFS_BUILDFLAGS}" \
-        ./configure ${CONFIGURE_OPTS}
+    ./configure ${CONFIGURE_OPTS}
 }
 
 hvbuild()