diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-23 13:51:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-23 14:02:54 +0100 |
| commit | db84cf1771b065b7e2840796f64abedf8692cb55 (patch) | |
| tree | 3c615ad9541644f27d08e8758246b6e42577ab80 /scp2/source | |
| parent | 1d1d886747ce9a7c90ac6499c9111d2cb5b9d1d5 (diff) | |
bump to libexttextcat
As an aside we can always use the configuration and data files belonging to the
system version now in --with-system-libexttextcat mode, so need for the --data
option.
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 8 |
3 files changed, 4 insertions, 8 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index ab305c5f3e30..fccf347b2fb0 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1504,7 +1504,7 @@ File gid_File_Lib_Migrationoo3 #endif End -#ifndef SYSTEM_LIBTEXTCAT +#ifndef SYSTEM_LIBEXTTEXTCAT File gid_File_Lib_Libtextcat TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index d0307d2a789f..4cf5debbfb23 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -472,7 +472,7 @@ STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 ) #endif #endif -#ifndef SYSTEM_LIBTEXTCAT_DATA +#ifndef SYSTEM_LIBEXTTEXTCAT // fingerprint files (lm) File gid_File_Conf_Fpdb diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 53f4f9d5c301..76fbc52cd915 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -228,12 +228,8 @@ SCPDEFS+=-DSYSTEM_PYTHON .ENDIF .ENDIF -.IF "$(SYSTEM_LIBTEXTCAT)" == "YES" -SCPDEFS+=-DSYSTEM_LIBTEXTCAT -.ENDIF - -.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != "" -SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA +.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES" +SCPDEFS+=-DSYSTEM_LIBEXTTEXTCAT .ENDIF .IF "$(WITH_VC_REDIST)" == "TRUE" |