CWS-TOOLING: integrate CWS gpc100

2009-08-07 20:21:15 +0200 ka  r274784 : CWS-TOOLING: rebase CWS gpc100 to trunk@274622 (milestone: DEV300:m54)
2009-08-07 14:11:35 +0200 ka  r274764 : #i75026#: removal of GPC dependency

4 files changed, 0 insertions, 98 deletions

diff --git a/configure b/configure
index 28516ec77d9c..cf1558b367d4 100755
--- a/configure
+++ b/configure
@@ -722,7 +722,6 @@ GCONF_CFLAGS
 ENABLE_KDE4
 ENABLE_KDE
 ENABLE_GTK
-WITH_GPC
 ZIP_HOME
 UNZIP
 ZIP
@@ -1030,7 +1029,6 @@ enable_option_checking
 with_gnu_patch
 with_agg
 with_gnu_cp
-with_gpc
 enable_graphite
 with_system_graphite
 enable_ldap
@@ -2030,9 +2028,6 @@ Optional Packages:
 
   --with-gnu-cp           Specify location of GNU cp on Solaris or FreeBSD
 
-  --without-gpc           Use the internal polygon clipping code instead of
-                          the external GPC polygon clipping library.
-
   --with-system-graphite    use graphite library already installed on system
 
   --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead
@@ -2873,14 +2868,6 @@ if test "${with_gnu_cp+set}" = set; then
   withval=$with_gnu_cp;
 fi
 
-
-# Check whether --with-gpc was given.
-if test "${with_gpc+set}" = set; then
-  withval=$with_gpc;
-else
-  if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi
-fi
-
 # Check whether --enable-graphite was given.
 if test "${enable_graphite+set}" = set; then
   enableval=$enable_graphite;
@@ -25227,46 +25214,6 @@ $as_echo "found and copied" >&6; }
 fi
 fi
 
-{ $as_echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5
-$as_echo_n "checking which polygon clipping code to use... " >&6; }
-WITH_GPC=NO
-
-if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then
-  WITH_GPC=YES
-  { $as_echo "$as_me:$LINENO: result: GPC" >&5
-$as_echo "GPC" >&6; }
-
-  { $as_echo "$as_me:$LINENO: checking for GPC files" >&5
-$as_echo_n "checking for GPC files... " >&6; }
-  if test -f ./external/gpc/gpc.h; then
-	HAVE_GPC_H="yes"
-  else
-	HAVE_GPC_H="no"
-  fi
-  if test -f ./external/gpc/gpc.c; then
-	HAVE_GPC_C="yes"
-  else
-	HAVE_GPC_C="no"
-  fi
-
-  if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
-	{ $as_echo "$as_me:$LINENO: result: GPC files found" >&5
-$as_echo "GPC files found" >&6; }
-  else
-	{ { $as_echo "$as_me:$LINENO: error: GPC files not found
-ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
-or use basegfx' implementation using --without-gpc" >&5
-$as_echo "$as_me: error: GPC files not found
-ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
-or use basegfx' implementation using --without-gpc" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
-fi
-
-
 { $as_echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5
 $as_echo_n "checking which VCLplugs shall be built... " >&6; }
 ENABLE_GTK=""
diff --git a/configure.in b/configure.in
index b66be4e664a3..8ebcc3dc4a97 100644
--- a/configure.in
+++ b/configure.in
@@ -25,10 +25,6 @@ AC_ARG_WITH(agg,
 AC_ARG_WITH(gnu-cp,
 [  --with-gnu-cp           Specify location of GNU cp on Solaris or FreeBSD
 ],,)
-AC_ARG_WITH(gpc,
-[  --without-gpc           Use the internal polygon clipping code instead of
-                          the external GPC polygon clipping library.
-],,if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi)
 AC_ARG_ENABLE(graphite,
 [  --enable-graphite       Enables the compilation of Graphite smart font rendering
 ],,)
@@ -5365,40 +5361,6 @@ fi
 fi
 
 dnl ===================================================================
-dnl Test for the presence of the right polygon clipping code
-dnl ===================================================================
-AC_MSG_CHECKING([which polygon clipping code to use])
-WITH_GPC=NO
-
-if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then
-  WITH_GPC=YES
-  AC_MSG_RESULT([GPC])
-
-  AC_MSG_CHECKING([for GPC files])
-  if test -f ./external/gpc/gpc.h; then
-	HAVE_GPC_H="yes"
-  else
-	HAVE_GPC_H="no"
-  fi
-  if test -f ./external/gpc/gpc.c; then
-	HAVE_GPC_C="yes"
-  else
-	HAVE_GPC_C="no"
-  fi
-
-  if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
-	AC_MSG_RESULT([GPC files found])
-  else
-	AC_MSG_ERROR([GPC files not found
-ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
-or use basegfx' implementation using --without-gpc])
-  fi
-else
-  AC_MSG_RESULT([internal])
-fi
-AC_SUBST(WITH_GPC)
-
-dnl ===================================================================
 dnl Test which vclplugs have to be built.
 dnl ===================================================================
 AC_MSG_CHECKING([which VCLplugs shall be built])
diff --git a/set_soenv.in b/set_soenv.in
index 4fae3c17255d..ed9603d9f13f 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1828,7 +1828,6 @@ ToFile( "SYSTEM_GRAPHITE",   "@SYSTEM_GRAPHITE@",   "e");
 ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
 ToFile( "GRAPHITE_CFLAGS",   "@GRAPHITE_CFLAGS@",   "e");
 ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
-ToFile( "WITH_GPC",          "@WITH_GPC@",         "e" );
 ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
 ToFile( "SYSTEM_DICTS",      "@SYSTEM_DICTS@",     "e");
 ToFile( "DICT_SYSTEM_DIR",   "@DICT_SYSTEM_DIR@",  "e");
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index a0a318230255..1ae4eeb9d11d 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -57,9 +57,6 @@ I18NUTILLIB=-li18nutil$(COMID)
 .INCLUDE .IGNORE : i18npool$/version.mk
 I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
-.IF "$(WITH_GPC)"!="NO"
-GPC3RDLIB=-lgpc
-.ENDIF
 .IF "$(GUI)$(COM)"=="WNTGCC"
 SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
@@ -357,9 +354,6 @@ ICUDATALIB=icudata.lib
 I18NUTILLIB=ii18nutil.lib
 I18NISOLANGLIB=ii18nisolang.lib
 I18NPAPERLIB=ii18npaper.lib
-.IF "$(WITH_GPC)"!="NO"
-GPC3RDLIB=gpc.lib
-.ENDIF
 SALHELPERLIB=isalhelper.lib
 XMLSCRIPTLIB=ixcr.lib
 COMPHELPERLIB=icomphelp.lib