diff options
-rw-r--r-- | configure.in | 48 | ||||
-rw-r--r-- | set_soenv.in | 2 |
2 files changed, 0 insertions, 50 deletions
diff --git a/configure.in b/configure.in index e41fa919e752..a84b9f8e32cc 100644 --- a/configure.in +++ b/configure.in @@ -115,10 +115,6 @@ AC_ARG_ENABLE(qadevooo, [ --disable-qadevooo OO.o includes some qa testsuites which some packagers may wish to build without ],,enable_qadevooo="yes") -AC_ARG_ENABLE(fontooo, -[ --disable-fontooo disable FontOOo - (useful for distributions using fontconfig for OOo) -],,enable_fontooo="yes") AC_ARG_ENABLE(mathmldtd, [ --disable-mathmldtd disable mathmldtd (useful for distributions that want to avoid packaging @@ -131,9 +127,6 @@ AC_ARG_ENABLE(evolution2, AC_ARG_WITH(system-stdlibs, [ --with-system-stdlibs use libstdc++/libgcc_s already on system ],,checkforprelink=yes) -AC_ARG_WITH(system-mspack, -[ --with-system-mspack use libmspack already installed on system -],,) AC_ARG_ENABLE(cups, [ --disable-cups disable cups support in the psprint project ],,enable_cups=yes) @@ -6247,47 +6240,6 @@ fi AC_SUBST(ENABLE_KAB) dnl =================================================================== -dnl Test whether to include FontOOo -dnl =================================================================== -AC_MSG_CHECKING([whether to include FontOOo]) -if test -n "$enable_fontooo"; then - if test "$enable_fontooo" = "no"; then - AC_MSG_RESULT([no]) - WITH_FONTOOO=NO - SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" - else - AC_MSG_RESULT([yes]) - WITH_FONTOOO=YES - BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT" - fi -else - AC_MSG_RESULT([no]) - WITH_FONTOOO=NO - SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" -fi -AC_SUBST(WITH_FONTOOO) - -if test "$WITH_FONTOOO" = "YES"; then - dnl =============================================================== - dnl Check whether to use libmspack from system - dnl =============================================================== - AC_MSG_CHECKING([whether to use system libmspack]) - if test -n "$with_system_mspack" -o -n "$with_system_libs" && \ - test "$with_system_mspack" != "no"; then - AC_MSG_RESULT([yes]) - SYSTEM_MSPACK=YES - AC_CHECK_HEADER(mspack.h, [], - [AC_MSG_ERROR([mspack.h not found, install libmspack])], []) - AC_CHECK_LIB(mspack, mspack_create_cab_decompressor, [], - [AC_MSG_ERROR(libmspack not installed or functional)], []) - else - AC_MSG_RESULT([no]) - SYSTEM_MSPACK=NO - fi -fi -AC_SUBST(SYSTEM_MSPACK) - -dnl =================================================================== dnl Test whether to include MathMLDTD dnl =================================================================== AC_MSG_CHECKING([whether to include MathMLDTD]) diff --git a/set_soenv.in b/set_soenv.in index 462fb9533e97..51325c64ee53 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1811,11 +1811,9 @@ ToFile( "WITHOUT_PPDS", "@WITHOUT_PPDS@", "e" ); ToFile( "WITH_BINFILTER", "@WITH_BINFILTER@", "e" ); ToFile( "BUILD_TYPE", "@BUILD_TYPE@", "e" ); ToFile( "VERBOSE", "@VERBOSE@", "e" ); -ToFile( "WITH_FONTOOO", "@WITH_FONTOOO@", "e" ); ToFile( "ENABLE_EVOAB2", "@ENABLE_EVOAB2@", "e" ); ToFile( "GOBJECT_CFLAGS", "@GOBJECT_CFLAGS@", "e" ); ToFile( "GOBJECT_LIBS", "@GOBJECT_LIBS@", "e" ); -ToFile( "SYSTEM_MSPACK", "@SYSTEM_MSPACK@", "e" ); if ( '@ENABLE_RPATH@' eq "no" ) { ToFile( "LINKFLAGSRUNPATH",'', "e" ); } |