config.h - remove all defines we never use

(strictly speaking PACKAGE and PACKAGE_NAME are unused, too, but
 let's keep them for now)

4 files changed, 0 insertions, 29 deletions

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index ef11542b0..123263ff4 100644
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -14,40 +14,21 @@ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS})
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS})
 
 CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF)
-CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR)
 CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK)
-CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
 CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H)
-CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H)
 CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)
 CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H)
-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
-CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H)
-CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET)
-CHECK_FUNCTION_EXISTS(pow HAVE_POW)
-CHECK_FUNCTION_EXISTS(sqrt HAVE_SQRT)
 CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
-CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
-CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
-CHECK_FUNCTION_EXISTS(strspn HAVE_STRSPN)
-CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR)
-CHECK_FUNCTION_EXISTS(strtoul HAVE_STRTOUL)
 CHECK_STRUCT_HAS_MEMBER(fordblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_FORDBLKS)
 CHECK_STRUCT_HAS_MEMBER(fsmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_FSMBLKS)
 CHECK_STRUCT_HAS_MEMBER(hblkhd mallinfo malloc.h HAVE_STRUCT_MALLINFO_HBLKHD)
 CHECK_STRUCT_HAS_MEMBER(uordblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_UORDBLKS)
 CHECK_STRUCT_HAS_MEMBER(usmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_USMBLKS)
-CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
-CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
 
 # Enable pango defines, necessary for compilation on Win32, how about Linux?
 # yes but needs to be done a better way
 if(HAVE_CAIRO_PDF)
     set(PANGO_ENABLE_ENGINE TRUE)
-    set(RENDER_WITH_PANGO_CAIRO TRUE)
 endif()
 
 # Relocatable Binary
diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake
index 4c537d4a3..4a3300d50 100644
--- a/CMakeScripts/ConfigEnv.cmake
+++ b/CMakeScripts/ConfigEnv.cmake
@@ -25,10 +25,8 @@ if(WIN32)
   

   # These options are required for having i18n support on Windows.

   option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON)

-  option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON)

   

   # Does not compile on Windows with these options.

-  option(BR_PTHREADS "Use binreloc thread support" OFF)

   option(ENABLE_BINRELOC "Use AutoPackage" OFF)

   option(WITH_JEMALLOC "Compile with JEMALLOC support" OFF)

 endif()

diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index 898d0dfc4..e10625294 100644
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -6,7 +6,6 @@ if(WIN32)
         CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
   endif()
   
-  set(INKSCAPE_LIBDIR "\\\\lib")
   set(INKSCAPE_DATADIR "") # can be set via the environment variable INKSCAPE_DATADIR at runtime
   
   set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale")
@@ -16,7 +15,6 @@ if(WIN32)
   
   mark_as_advanced(SHARE_INSTALL)
 else()
-  set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
   set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 
   # TODO: check and change this to correct value:
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 9387926eb..a6b59e26a 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -122,9 +122,6 @@ if(ENABLE_POPPLER)
             if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND)
                 set(HAVE_POPPLER_CAIRO ON)
             endif()
-            if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND)
-                set(HAVE_POPPLER_GLIB ON)
-            endif()
         endif()
     else()
         set(ENABLE_POPPLER_CAIRO OFF)
@@ -141,7 +138,6 @@ add_definitions(${POPPLER_DEFINITIONS})
 if(WITH_LIBWPG)
     find_package(LibWPG)
     if(LIBWPG_FOUND)
-        set(WITH_LIBWPG01 ${LIBWPG-0.1_FOUND})
         set(WITH_LIBWPG02 ${LIBWPG-0.2_FOUND})
         set(WITH_LIBWPG03 ${LIBWPG-0.3_FOUND})
         list(APPEND INKSCAPE_INCS_SYS ${LIBWPG_INCLUDE_DIRS})
@@ -155,7 +151,6 @@ endif()
 if(WITH_LIBVISIO)
     find_package(LibVisio)
     if(LIBVISIO_FOUND)
-        set(WITH_LIBVISIO00 ${LIBVISIO-0.0_FOUND})
         set(WITH_LIBVISIO01 ${LIBVISIO-0.1_FOUND})
         list(APPEND INKSCAPE_INCS_SYS ${LIBVISIO_INCLUDE_DIRS})
         list(APPEND INKSCAPE_LIBS     ${LIBVISIO_LIBRARIES})
@@ -168,7 +163,6 @@ endif()
 if(WITH_LIBCDR)
     find_package(LibCDR)
     if(LIBCDR_FOUND)
-        set(WITH_LIBCDR00 ${LIBCDR-0.0_FOUND})
         set(WITH_LIBCDR01 ${LIBCDR-0.1_FOUND})
         list(APPEND INKSCAPE_INCS_SYS ${LIBCDR_INCLUDE_DIRS})
         list(APPEND INKSCAPE_LIBS     ${LIBCDR_LIBRARIES})