Add CMake option to disable libproxy usage and disable it on SLE. (bnc#752500)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2672785..b879512 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,10 @@ SET( PACKAGE "libzypp" )
 SET( CMAKE_MODULE_PATH ${LIBZYPP_SOURCE_DIR}/cmake/modules )
 cmake_minimum_required(VERSION 2.6)
 
+
+OPTION (DISABLE_LIBPROXY "Build without libproxy support even if package is installed?" OFF)
+
+
 # allow name libraries by name mixed with full
 # paths
 if(COMMAND cmake_policy)
@@ -155,13 +159,17 @@ ELSE ( NOT UDEV_FOUND )
   ADD_DEFINITIONS(-DHAVE_UDEV)
 ENDIF ( NOT UDEV_FOUND )
 
-FIND_PACKAGE(libproxy)
-IF ( NOT LIBPROXY_FOUND )
-  MESSAGE( STATUS " libproxy not found" )
-ELSE ( NOT LIBPROXY_FOUND )
-  INCLUDE_DIRECTORIES( ${LIBPROXY_INCLUDE_DIR} )
-  ADD_DEFINITIONS(-D_WITH_LIBPROXY_SUPPORT_)
-ENDIF( NOT LIBPROXY_FOUND )
+IF( DISABLE_LIBPROXY )
+  MESSAGE( STATUS "libproxy support disabled" )
+ELSE( DISABLE_LIBPROXY )
+  FIND_PACKAGE(libproxy)
+  IF ( NOT LIBPROXY_FOUND )
+    MESSAGE( STATUS "libproxy not found" )
+  ELSE ( NOT LIBPROXY_FOUND )
+    INCLUDE_DIRECTORIES( ${LIBPROXY_INCLUDE_DIR} )
+    ADD_DEFINITIONS(-D_WITH_LIBPROXY_SUPPORT_)
+  ENDIF( NOT LIBPROXY_FOUND )
+ENDIF( DISABLE_LIBPROXY )
 
 FIND_PROGRAM( DOXYGEN doxygen )
 IF ( NOT DOXYGEN )

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 8295d43..7caaa5c 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -202,10 +202,12 @@ cd build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 unset TRANSLATION_SET
+unset EXTRA_CMAKE_OPTIONS
 # SLE11-* might want its own translation set:
 %if 0%{?suse_version} == 1110
 if [ -f ../po/sle-zypp-po.tar.bz ]; then
   export TRANSLATION_SET=sle-zypp
+  export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
 fi
 %endif
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -214,6 +216,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_SKIP_RPATH=1 \
       -DUSE_TRANSLATION_SET=${TRANSLATION_SET:-zypp} \
+      ${EXTRA_CMAKE_OPTIONS} \
       ..
 make %{?_smp_mflags} VERBOSE=1
 make -C doc/autodoc %{?_smp_mflags}