diff options
Diffstat (limited to 'config_office/set_soenv.in')
| -rw-r--r-- | config_office/set_soenv.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index dd27dc9fa68f..be6237950916 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -62,7 +62,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_WRITES_FLAG, my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE, $GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $CDPATHx, $JRELIBDIR, - $JREEXTRALIBDIR, $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, + $JREEXTRALIBDIR, $JRETOOLKITDIR, $JRETHREADDIR, $FLIPCMD ); # #------------------------------------------- @@ -144,7 +144,6 @@ if ( $MINGW eq "yes" ) else { $CC = PathFormat('@CC@'); # C compiler $CXX = PathFormat('@CXX@'); } # C++ compiler -$EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type $MOZILLA_VERSION = '@MOZILLA_VERSION@'; # mozilla version to use to build mozilla $MOZILLA_TOOLKIT = '@MOZILLA_TOOLKIT@'; # GUI toolkit to use to build mozilla $FLIPCMD = ""; # Flip '/' to '\' wrapper (only for winnt) @@ -1775,7 +1774,6 @@ ToFile( "GLIBC", $GLIBC, "e" ); ToFile( "GUIBASE", $GUIBASE, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); -ToFile( "EXCEPTIONS", $EXCEPTIONS, "e" ); ToFile( "OSVERSION", $OSVERSION, "e" ); ToFile( "PTHREAD_CFLAGS", "@PTHREAD_CFLAGS@", "e" ); ToFile( "PTHREAD_LIBS", "@PTHREAD_LIBS@", "e" ); @@ -1947,6 +1945,9 @@ ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" ); ToFile( "SYSTEM_JPEG", "@SYSTEM_JPEG@", "e" ); ToFile( "FREETYPE_CFLAGS", "@FREETYPE_CFLAGS@", "e" ); ToFile( "FREETYPE_LIBS", "@FREETYPE_LIBS@", "e" ); +ToFile( "SYSTEM_POPPLER", "@SYSTEM_POPPLER@", "e" ); +ToFile( "POPPLER_CFLAGS", "@POPPLER_CFLAGS@", "e" ); +ToFile( "POPPLER_LIBS", "@POPPLER_LIBS@", "e" ); ToFile( "SYSTEM_CAIRO", "@SYSTEM_CAIRO@", "e" ); ToFile( "CAIRO_CFLAGS", "@CAIRO_CFLAGS@", "e" ); ToFile( "CAIRO_LIBS", "@CAIRO_LIBS@", "e" ); |