projects / packages / libreoffice.git / blame
| Commit | Line | Data |
|---|---|---|
| ac0ea3af PG |
1 | diff -Naur OOO_STABLE_1.orig/config_office/configure.in OOO_STABLE_1/config_office/configure.in |
| 2 | --- OOO_STABLE_1.orig/config_office/configure.in Wed Apr 24 20:54:58 2002 | |
| 3 | +++ OOO_STABLE_1/config_office/configure.in Wed Apr 24 20:55:18 2002 | |
| 4 | @@ -1073,23 +1073,23 @@ | |
| 5 | dnl Test for the presence of the required gpc.{c,h} files | |
| 6 | dnl =================================================================== | |
| 7 | ||
| 8 | -AC_MSG_CHECKING([GPC files]) | |
| 9 | -if test -f ../external/gpc/gpc.h; then | |
| 10 | - HAVE_GPC_H="yes" | |
| 11 | -else | |
| 12 | - HAVE_GPC_H="no" | |
| 13 | -fi | |
| 14 | -if test -f ../external/gpc/gpc.c; then | |
| 15 | - HAVE_GPC_C="yes" | |
| 16 | -else | |
| 17 | - HAVE_GPC_C="no" | |
| 18 | -fi | |
| 19 | +dnl AC_MSG_CHECKING([GPC files]) | |
| 20 | +dnl if test -f ../external/gpc/gpc.h; then | |
| 21 | +dnl HAVE_GPC_H="yes" | |
| 22 | +dnl else | |
| 23 | +dnl HAVE_GPC_H="no" | |
| 24 | +dnl fi | |
| 25 | +dnl if test -f ../external/gpc/gpc.c; then | |
| 26 | +dnl HAVE_GPC_C="yes" | |
| 27 | +dnl else | |
| 28 | +dnl HAVE_GPC_C="no" | |
| 29 | +dnl fi | |
| 30 | ||
| 31 | -if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then | |
| 32 | - AC_MSG_RESULT([GPC files found]) | |
| 33 | -else | |
| 34 | - AC_MSG_ERROR([GPC files not found]) | |
| 35 | -fi | |
| 36 | +dnl if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then | |
| 37 | +dnl AC_MSG_RESULT([GPC files found]) | |
| 38 | +dnl else | |
| 39 | +dnl AC_MSG_ERROR([GPC files not found]) | |
| 40 | +dnl fi | |
| 41 | ||
| 42 | dnl =================================================================== | |
| 43 | dnl Setting up the environment. | |
| 44 | diff -Naur OOO_STABLE_1.orig/external/prj/build.lst OOO_STABLE_1/external/prj/build.lst | |
| 45 | --- OOO_STABLE_1.orig/external/prj/build.lst Fri Jan 11 19:47:18 2002 | |
| 46 | +++ OOO_STABLE_1/external/prj/build.lst Wed Apr 24 20:50:33 2002 | |
| a5ad006a | 47 | @@ -4,7 +4,5 @@ |
| 48 | es external\atl nmake - w es_atl NULL | |
| ac0ea3af PG |
49 | es external\glibc nmake - all es_glibc NULL |
| 50 | es external\glibc\rtufiles nmake - all es_glibcrtu es_glibc NULL | |
| 51 | -es external\gpc nmake - u es_gpc NULL | |
| 52 | -es external\gpc nmake - w es_gpc NULL | |
| a5ad006a | 53 | es external\w4w nmake - u es_w4w NULL |
| 54 | es external\gcc3_specific nmake - u es_gcc3spec NULL | |
| ac0ea3af PG |
55 | diff -Naur OOO_STABLE_1.orig/external/prj/d.lst OOO_STABLE_1/external/prj/d.lst |
| 56 | --- OOO_STABLE_1.orig/external/prj/d.lst Tue Jun 26 15:07:02 2001 | |
| 57 | +++ OOO_STABLE_1/external/prj/d.lst Wed Apr 24 20:55:24 2002 | |
| 58 | @@ -7,7 +7,6 @@ | |
| 59 | mkdir: %_DEST%\inc%_EXT%\external\freetype\config | |
| 60 | mkdir: %_DEST%\inc%_EXT%\external\freetype\internal | |
| 61 | mkdir: %_DEST%\inc%_EXT%\external\glibc | |
| 62 | -mkdir: %_DEST%\inc%_EXT%\external\gpc | |
| 63 | mkdir: %_DEST%\inc%_EXT%\external\jpeg | |
| 64 | mkdir: %_DEST%\inc%_EXT%\external\npsdk | |
| 65 | mkdir: %_DEST%\inc%_EXT%\external\odbc | |
| 66 | diff -Naur OOO_STABLE_1.orig/gpc.diff OOO_STABLE_1/gpc.diff | |
| 67 | diff -Naur OOO_STABLE_1.orig/solenv/inc/libs.mk OOO_STABLE_1/solenv/inc/libs.mk | |
| 68 | --- OOO_STABLE_1.orig/solenv/inc/libs.mk Fri Oct 26 17:14:41 2001 | |
| 69 | +++ OOO_STABLE_1/solenv/inc/libs.mk Wed Apr 24 20:50:33 2002 | |
| c4ea1e69 | 70 | @@ -73,7 +73,7 @@ |
| ac0ea3af PG |
71 | # |
| 72 | ||
| c4ea1e69 | 73 | ICUI18NLIB=-licui18n -licuuc -licule -licudata |
| ac0ea3af PG |
74 | -GPC3RDLIB=-lgpc |
| 75 | +GPC3RDLIB=-lgpcl | |
| 76 | SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) | |
| c4ea1e69 | 77 | XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX) |
| ac0ea3af | 78 | COMPHELPERLIB=-lcomphelp2 |