]>
Commit | Line | Data |
---|---|---|
4e59c08c AM |
1 | Index: bin/build-ooo |
2 | =================================================================== | |
3 | RCS file: /cvs/gnome/ooo-build/bin/build-ooo,v | |
4 | retrieving revision 1.87 | |
5 | retrieving revision 1.88 | |
6 | diff -u -u -r1.87 -r1.88 | |
7 | --- openoffice/bin/build-ooo 21 Jun 2004 15:39:16 -0000 1.87 | |
8 | +++ openoffice/bin/build-ooo 7 Jul 2004 09:57:30 -0000 1.88 | |
9 | @@ -85,7 +85,7 @@ | |
10 | ||
11 | ||
12 | # build vcl module for the non-default widget sets if any | |
13 | -if test "${OOO_WIDGET_SETS/*,*/comma}" = "comma" ; then | |
14 | +if (echo "${OOO_WIDGET_SETS}" | grep -q ",") ; then | |
15 | ||
16 | echo 'Builiding support for the non-default native widget sets' | |
17 | ||
18 | @@ -104,7 +104,8 @@ | |
19 | # configure | |
20 | IFS="$IFS_saved" | |
21 | cd $OOBUILDDIR/config_office | |
22 | - ./configure $CONFIGURE_OPTIONS --with-widgetset="${widgetset/original/}" || exit 1; | |
23 | + ./configure $CONFIGURE_OPTIONS \ | |
24 | + `[ "${widgetset}" != "original" ] && echo "--with-widgetset=\"${widgetset}\""` || exit 1; | |
25 | ||
26 | # import the updated OO.o environment | |
27 | if test "z$DISTRO" = "zWin32"; then |