001-iconv-disabling-option.patch (1979B)
1 --- a/cmake/FindIconv.cmake 2 +++ b/cmake/FindIconv.cmake 3 @@ -34,9 +34,9 @@ string(REGEX REPLACE "(.*)/include/?" "\ 4 5 FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c HINTS "${ICONV_INCLUDE_BASE_DIR}/lib" PATHS /opt/local/lib) 6 7 -IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 8 +IF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 9 SET(ICONV_FOUND TRUE) 10 -ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 11 +ENDIF(NOT DISABLE_ICONV AND ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 12 13 set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) 14 set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) 15 --- a/configure 16 +++ b/configure 17 @@ -31,6 +31,7 @@ Usage: ./configure [options] 18 --enable-backup enable backup support 19 --enable-win32 enable mingw crosscomilation 20 --enable-protection enable compile time protections 21 +--disable-iconv disable iconv support 22 --with-python=<path> path to Python interpreter 23 --without-gnapplet disable installation of gnapplet 24 --without-completion disable installation of bash completion script 25 @@ -57,6 +58,7 @@ CMAKE_PROTECTION= 26 CMAKE_PYTHON= 27 CMAKE_GNAP= 28 CMAKE_COMPLETE= 29 +CMAKE_ICONV= 30 31 # process command line 32 while [ "$#" -gt 0 ] ; do 33 @@ -94,6 +96,12 @@ while [ "$#" -gt 0 ] ; do 34 --disable-protection) 35 CMAKE_PROTECTION="-DENABLE_PROTECTION=OFF" 36 ;; 37 + --enable-iconv) 38 + CMAKE_ICONV="-DDISABLE_ICONV=OFF" 39 + ;; 40 + --disable-iconv) 41 + CMAKE_ICONV="-DDISABLE_ICONV=ON" 42 + ;; 43 --enable-debug) 44 CMAKE_DEBUG="-DCMAKE_BUILD_TYPE=Debug" 45 ;; 46 @@ -142,4 +150,4 @@ fi 47 cd "$BUILD_DIR" 48 49 # invoke cmake to do configuration 50 -cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE 51 +cmake $SOURCE_DIR $CMAKE_PREFIX $CMAKE_SHARED $CMAKE_DEBUG $CMAKE_BACKUP $CMAKE_CROSS $CMAKE_PROTECTION $CMAKE_PYTHON $CMAKE_GNAP $CMAKE_COMPLETE $CMAKE_ICONV