summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in57
-rw-r--r--scp2/source/canvas/canvascommons.scp6
-rw-r--r--scp2/source/canvas/makefile.mk7
-rw-r--r--set_soenv.in3
4 files changed, 0 insertions, 73 deletions
diff --git a/configure.in b/configure.in
index 8704551be0dc..9b6872f8fee3 100644
--- a/configure.in
+++ b/configure.in
@@ -19,9 +19,6 @@ echo "$@" >config.parms
AC_ARG_WITH(gnu-patch,
[ --with-gnu-patch Specify location of GNU patch on Solaris or FreeBSD
],,)
-AC_ARG_WITH(agg,
-[ --without-agg Disable the use of agg altogether
-],,with_agg=yes)
AC_ARG_WITH(gnu-cp,
[ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD
],,)
@@ -566,9 +563,6 @@ AC_ARG_ENABLE(Xaw,
AC_ARG_WITH(system-neon,
[ --with-system-neon Use neon already on system
],,)
-AC_ARG_WITH(system-agg,
-[ --with-system-agg Use AGG already on system
-],,)
AC_ARG_WITH(system-hunspell,
[ --with-system-hunspell Use libhunspell already on system
],,)
@@ -5201,57 +5195,6 @@ AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
dnl ===================================================================
-dnl Test for disabling agg
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable agg])
-if test "$with_agg" = "no"; then
- AC_MSG_RESULT([no])
-else
- AC_MSG_RESULT([yes])
- ENABLE_AGG=YES
- AC_SUBST(ENABLE_AGG)
-
- dnl ===================================================================
- dnl Check for system AGG
- dnl ===================================================================
- AC_MSG_CHECKING([which AGG to use])
- if test -n "$with_system_agg" -o -n "$with_system_libs" && \
- test "$with_system_agg" != "no"; then
- AC_MSG_RESULT([external])
- PKG_CHECK_MODULES(AGG, libagg >= 2.3)
- AC_MSG_CHECKING([agg version])
- # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway
- # (/usr/include gets stripped from pkg-config output)
- if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then
- AGG_INCDIR="`$PKG_CONFIG --variable includedir libagg`/agg2"
- else
- AGG_INCDIR="`echo $AGG_CFLAGS | $SED -e s/-I//`"
- fi
- if $PKG_CONFIG --modversion libagg | grep -q 2.3 || \
- $PKG_CONFIG --modversion libagg | grep -q 2.4; then
- # 2.4's libagg.pc.in still contains 2.3 :/
- if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
- AC_MSG_RESULT([2.4])
- AGG_VERSION=2400
- else
- AC_MSG_RESULT([2.3])
- AGG_VERSION=2300
- fi
- SYSTEM_AGG=YES
- else
- AC_MSG_ERROR([only agg 2.3 and 2.4 are supported])
- fi
- else
- AC_MSG_RESULT([internal])
- SYSTEM_AGG=NO
- AGG_VERSION=2300
- BUILD_TYPE="$BUILD_TYPE AGG"
- fi
- AC_SUBST(SYSTEM_AGG)
- AC_SUBST(AGG_VERSION)
-fi
-
-dnl ===================================================================
dnl Check for system redland
dnl ===================================================================
AC_MSG_CHECKING([which redland library to use])
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index f095eff9f23e..3b58fc69e0c3 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -30,11 +30,5 @@
STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
-#ifdef ENABLE_AGG
-#ifndef SYSTEM_AGG
-STD_LIB_FILE(gid_File_Lib_Agg, agg)
-#endif
-#endif
-
SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 7cb5a6cd0a80..fe6d56460d5f 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -39,13 +39,6 @@ TARGETTYPE=CUI
SCP_PRODUCT_TYPE=osl
-.IF "$(ENABLE_AGG)" == "YES"
-SCPDEFS+=-DENABLE_AGG
-.IF "$(SYSTEM_AGG)" == "YES"
-SCPDEFS+=-DSYSTEM_AGG
-.ENDIF
-.ENDIF
-
PARFILES= canvascommons.par \
vclcanvas.par \
mtfrenderer.par
diff --git a/set_soenv.in b/set_soenv.in
index 342657368bc3..1ae3d6615480 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1934,9 +1934,6 @@ ToFile( "NEON_LIBS", "@NEON_LIBS@", "e" );
ToFile( "NEON_CFLAGS", "@NEON_CFLAGS@", "e" );
ToFile( "DISABLE_NEON", "@DISABLE_NEON@", "e" );
ToFile( "DISABLE_XAW", "@DISABLE_XAW@", "e" );
-ToFile( "ENABLE_AGG", "@ENABLE_AGG@", "e" );
-ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" );
-ToFile( "AGG_VERSION", "@AGG_VERSION@", "e" );
ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );
ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );