From 77e98a884252c3aaa0e12d584feff3915a52cdf1 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Sun, 26 Feb 2017 19:28:14 +0100
Subject: CMake: Purge GS_PATH and GS_BIN They're only defined on Windows while
 not being used anywhere

(bzr r15549)
---
 CMakeLists.txt |  2 --
 mingwenv.bat   |  6 +-----
 mingwenv.cmake | 25 -------------------------
 msysenv.sh     |  8 +-------
 4 files changed, 2 insertions(+), 39 deletions(-)
 mode change 100755 => 100644 mingwenv.bat
 mode change 100644 => 100755 msysenv.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4b87c7cd..df17342ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,8 +312,6 @@ message("DEVLIBS_PATH:            ${DEVLIBS_PATH}")
 message("DEVLIBS_LIB:             ${DEVLIBS_LIB}")
 message("DEVLIBS_BIN:             ${DEVLIBS_BIN}")
 message("PKG_CONFIG_PATH:         ${PKG_CONFIG_PATH}")
-message("GS_PATH                  ${GS_PATH}")
-message("GS_BIN                   ${GS_BIN}")
 endif()
 
 message("------------------------------------------------------------------------")
diff --git a/mingwenv.bat b/mingwenv.bat
old mode 100755
new mode 100644
index 255920668..e4b9047f1
--- a/mingwenv.bat
+++ b/mingwenv.bat
@@ -12,18 +12,14 @@ REM Directory containing the MinGW instance used for compilation. Usually c:\min
 REM Note: Make sure there are no whitespaces in the path. MinGW doesn't like that.. ;)
 if "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw64
 
-REM Directory containing the (optional) Ghostscript installation.
-if "%GS_PATH%"=="" set GS_PATH=C:\latex\gs\gs8.61
-
 REM -----------------------------------------------------------------------------
 @echo Setting environment variables for MinGW build of Inkscape..
 
 @echo  DEVLIBS_PATH: %DEVLIBS_PATH%
 @echo  MINGW_PATH:   %MINGW_PATH%
-@echo  GS_PATH:      %GS_PATH%
 
 REM Include the MinGW environment in the path to prevent error messages during CMake configure.
-set PATH=%DEVLIBS_PATH%\bin;%DEVLIBS_PATH%\python;%MINGW_PATH%\bin;%PATH%;%GS_PATH%\bin
+set PATH=%DEVLIBS_PATH%\bin;%DEVLIBS_PATH%\python;%MINGW_PATH%\bin;%PATH%
 
 REM Also set the pkgconfig path to prevent error messages during CMake configure.
 set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig
\ No newline at end of file
diff --git a/mingwenv.cmake b/mingwenv.cmake
index 99b50a6bf..64766a60c 100644
--- a/mingwenv.cmake
+++ b/mingwenv.cmake
@@ -10,9 +10,6 @@ set(ENV_DEVLIBS_PATH C:/devlibs64)
 # Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64
 set(ENV_MINGW_PATH C:/mingw64)
 
-# Directory containing the (optional) Ghostscript installation.
-set(ENV_GS_PATH C:/latex/gs/gs8.61)
-
 # -----------------------------------------------------------------------------
 # MinGW Configuration
 # -----------------------------------------------------------------------------
@@ -33,19 +30,10 @@ else()
   message(STATUS "  Setting path to MinGW from environment: $ENV{MINGW_PATH}")
   set(MINGW_PATH $ENV{MINGW_PATH})
 endif()
-
-if("$ENV{GS_PATH}" STREQUAL "")
-  message(STATUS "  Setting path to Ghostscript from mingwenv.cmake: ${ENV_GS_PATH}")
-  set(GS_PATH ${ENV_GS_PATH})
-else()
-  message(STATUS "  Setting path to Ghostscript from environment: $ENV{GS_PATH}")
-  set(GS_PATH $ENV{GS_PATH})
-endif()
   
 # Normalize directory separator slashes.
 string(REGEX REPLACE "\\\\" "/" DEVLIBS_PATH ${DEVLIBS_PATH})
 string(REGEX REPLACE "\\\\" "/" MINGW_PATH ${MINGW_PATH})
-string(REGEX REPLACE "\\\\" "/" GS_PATH ${GS_PATH})
 
 # -----------------------------------------------------------------------------
 # DEVLIBS CHECKS
@@ -189,19 +177,6 @@ if(HAVE_MSYS)
   endif()
 endif()
 
-# -----------------------------------------------------------------------------
-# GHOSTSCRIPT CHECKS
-# -----------------------------------------------------------------------------
-
-# Check for Ghostscript.
-set(GS_BIN "${GS_PATH}/bin")
-
-if(EXISTS "${GS_BIN}")
-  set(HAVE_GS_BIN ON)
-else()
-  set(HAVE_GS_BIN OFF)
-endif()
-
 # -----------------------------------------------------------------------------
 # LIBRARY AND LINKER SETTINGS
 # -----------------------------------------------------------------------------
diff --git a/msysenv.sh b/msysenv.sh
old mode 100644
new mode 100755
index 88252a919..d1639efbe
--- a/msysenv.sh
+++ b/msysenv.sh
@@ -14,21 +14,15 @@ fi
 if [ -z $MINGW_PATH ]; then
 	export MINGW_PATH="/c/mingw64";
 fi
-# Directory containing the (optional) Ghostscript installation.
-
-if [ -z $GS_PATH ]; then
-	export GS_PATH="/c/latex/gs/gs8.61";
-fi
 
 # -----------------------------------------------------------------------------
 echo Setting environment variables for MSYS build of Inkscape:
 echo
 echo  "DEVLIBS_PATH: "$DEVLIBS_PATH
 echo  "MINGW_PATH:   "$MINGW_PATH
-echo  "GS_PATH:      "$GS_PATH
 
 # Include the MinGW environment in the path to prevent error messages during CMake configure.
-export PATH=$DEVLIBS_PATH/bin:$DEVLIBS_PATH/python:$MINGW_PATH/bin:$PATH:$GS_PATH/bin
+export PATH=$DEVLIBS_PATH/bin:$DEVLIBS_PATH/python:$MINGW_PATH/bin:$PATH
 
 # Also set the pkgconfig path to prevent error messages during CMake configure.
 export PKG_CONFIG_PATH=$DEVLIBS_PATH/lib/pkgconfig
-- 
cgit v1.2.3