From: Brian P. Hinz <bphinz@users.sf.net>
Date: Tue, 4 Nov 2014 05:00:19 +0000 (-0500)
Subject: Back out previous change
X-Git-Tag: v1.3.90~15^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=37c2f4da50957c3c27a3fe392f3d304f221b616e;p=tigervnc.git

Back out previous change

Needed to merge upstream changes in before creating pull request.
---

diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake
index 49706bd3..df12db41 100644
--- a/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@@ -30,14 +30,9 @@ if(BUILD_STATIC)
       HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS})
     FIND_LIBRARY(NETTLE_LIBRARY NAMES nettle libnettle
       HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS})
-    FIND_LIBRARY(TASN1_LIBRARY NAMES tasn1 libtasn1
-      HINTS ${PC_GNUTLS_LIBDIR} ${PC_GNUTLS_LIBRARY_DIRS})
 
-    set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls")
+    set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls -ltasn1")
 
-    if(TASN1_LIBRARY)
-      set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -ltasn1")
-    endif()
     if(NETTLE_LIBRARY)
       set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lnettle -lhogweed -lgmp")
     endif()