projects / packages / libreoffice.git / blame
| Commit | Line | Data |
|---|---|---|
| a45938b8 ER |
1 | --- config_office/configure.in~ 2005-07-28 00:12:10.000000000 +0300 |
| 2 | +++ config_office/configure.in 2005-07-28 00:12:50.000000000 +0300 | |
| 3 | @@ -1751,10 +1751,14 @@ | |
| 4 | fi | |
| 5 | fi | |
| 6 | else | |
| 7 | - if test -f "$STLPORT4/lib/libstlport_gcc.so"; then | |
| 8 | + if test -f "$STLPORT4/lib64/libstlport_gcc.so"; then | |
| 9 | AC_MSG_RESULT([checked]) | |
| 10 | else | |
| 11 | - AC_MSG_ERROR([STLport4 libraries not found]) | |
| 12 | + if test -f "$STLPORT4/lib/libstlport_gcc.so"; then | |
| 13 | + AC_MSG_RESULT([checked]) | |
| 14 | + else | |
| 15 | + AC_MSG_ERROR([STLport4 libraries not found]) | |
| 16 | + fi | |
| 17 | fi | |
| 18 | fi | |
| 19 | fi | |
| 20 | ||
| 21 | ||
| 22 | # this one is ugly, it will break if you have STLPORT installed for both (32/64) archs | |
| 23 | # but i didn't want to make this patch arch specific either. perhaps test for | |
| 24 | # glob would be cleaner solution. glen 2005-07-28 | |
| 25 | --- stlport/makefile.mk~ 2005-07-28 01:22:23.000000000 +0300 | |
| 26 | +++ stlport/makefile.mk 2005-07-28 01:22:24.000000000 +0300 | |
| 27 | @@ -207,7 +207,7 @@ | |
| 28 | all : | |
| 29 | @echo " An already available installation of STLport has been chosen in the configure process." | |
| 30 | @echo " Therefore the version provided here does not need to be built in addition." | |
| 31 | - +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST) | |
| 32 | + +$(COPY) $(STLPORT4)$/lib*$/*stlport*$(DLLPOST) $(DLLDEST) | |
| 33 | .ENDIF | |
| 34 | ||
| 35 | .INCLUDE : set_ext.mk |