]> source.dussan.org Git - tigervnc.git/commitdiff
Static build fix - only attempt to link against libtasn1 if it's present 59/head
authorBrian P. Hinz <bphinz@users.sf.net>
Tue, 4 Nov 2014 05:03:24 +0000 (00:03 -0500)
committerBrian P. Hinz <bphinz@users.sf.net>
Tue, 4 Nov 2014 05:03:24 +0000 (00:03 -0500)
GnuTLS may be compiled without external libtasn1, so we shouldn't try
to link against it unless it's actually present.

cmake/StaticBuild.cmake

index df12db41edb02743b9e0b919025590c12058be34..49706bd356bf4f689a22d4b711501945b50bedde 100644 (file)
@@ -30,9 +30,14 @@ 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 -ltasn1")
+    set(GNUTLS_LIBRARIES "-Wl,-Bstatic -lgnutls")
 
+    if(TASN1_LIBRARY)
+      set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -ltasn1")
+    endif()
     if(NETTLE_LIBRARY)
       set(GNUTLS_LIBRARIES "${GNUTLS_LIBRARIES} -lnettle -lhogweed -lgmp")
     endif()