projects / packages / libreoffice.git / blame
| Commit | Line | Data |
|---|---|---|
| 1c6fec54 AM |
1 | Index: bin/setup.in |
| 2 | =================================================================== | |
| 3 | RCS file: /cvs/gnome/ooo-build/bin/setup.in,v | |
| 4 | retrieving revision 1.66 | |
| e443c73b AM |
5 | retrieving revision 1.68 |
| 6 | diff -u -u -r1.66 -r1.68 | |
| 1c6fec54 | 7 | --- openoffice/bin/setup.in 3 Jul 2004 02:14:36 -0000 1.66 |
| e443c73b AM |
8 | +++ openoffice/bin/setup.in 7 Jul 2004 17:26:23 -0000 1.68 |
| 9 | @@ -72,13 +72,19 @@ | |
| 10 | ||
| 11 | else | |
| 12 | if test "z$CONFIGURE_OPTIONS" = "z"; then | |
| 13 | - CONFIGURE_OPTIONS="--with-lang=$LANGS \ | |
| 14 | - --enable-libart --enable-libsn --enable-crashdump=no \ | |
| 15 | - --without-fonts --disable-rpath \ | |
| 16 | - --with-system-zlib --enable-fontconfig \ | |
| 17 | - --with-system-freetype --disable-mozilla \ | |
| 18 | - --with-widget-sets=original,kde,gtk"; | |
| 1c6fec54 AM |
19 | + if [ -s ./setup.configure ]; then |
| 20 | + . ./setup.configure | |
| 21 | + echo "Using configure options from the ./setup.configure file"; | |
| 22 | + else | |
| e443c73b AM |
23 | + CONFIGURE_OPTIONS="--with-lang=$LANGS \ |
| 24 | + --enable-libart --enable-libsn --enable-crashdump=no \ | |
| 25 | + --without-fonts --disable-rpath \ | |
| 26 | + --with-system-zlib --enable-fontconfig \ | |
| 27 | + --with-system-freetype --disable-mozilla \ | |
| 28 | + --with-widget-sets=original,kde,gtk"; | |
| 1c6fec54 | 29 | + fi |
| e443c73b | 30 | else |
| dc7f1933 | 31 | + echo "CONFIGURE_OPTIONS=\"`echo \"$CONFIGURE_OPTIONS\" | xargs`\"" > ./setup.configure |
| e443c73b | 32 | echo "Using configure options from the environment"; |
| 1c6fec54 AM |
33 | fi |
| 34 | fi | |
| 8f955fc0 AM |
35 | diff -u -u -r1.30 -r1.31 |
| 36 | --- openoffice/bin/package-ooo 6 Jul 2004 13:37:53 -0000 1.30 | |
| 37 | +++ openoffice/bin/package-ooo 7 Jul 2004 23:24:25 -0000 1.31 | |
| 38 | @@ -155,7 +155,7 @@ | |
| 39 | echo "Done"; | |
| 40 | ||
| 41 | # install vcl module for more widget sets if needed | |
| 42 | -if test "${OOO_WIDGET_SETS/*,*/comma}" = "comma" ; then | |
| 43 | +if (echo "${OOO_WIDGET_SETS}" | grep -q ",") ; then | |
| 44 | # Must remove the ./instsetoo/$ARCHITECTURE/*/normal/install scripts | |
| 45 | # as they conflict with the normal system install binary | |
| 46 | rm -f $OOBUILDDIR/instsetoo/$ARCHITECTURE/*/normal/install |