[csipc2-commits] SF.net SVN: csipc2: [1516] trunk

[<csi...@li...>]

Revision: 1516
          http://csipc2.svn.sourceforge.net/csipc2/?rev=1516&view=rev
Author:   warcamel
Date:     2008-05-28 05:12:42 -0700 (Wed, 28 May 2008)

Log Message:
-----------
- modified configure.in:
  - remove duplicate gtk2-test
  - added gnutls-check
- added subdir to Makefile for creating man1-file of ccd_connection
- added missing source file for ccd_connection_gui to Makefile

Modified Paths:
--------------
    trunk/configure.in
    trunk/src/tests/ccd_connection/Makefile.am

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-05-27 22:41:43 UTC (rev 1515)
+++ trunk/configure.in	2008-05-28 12:12:42 UTC (rev 1516)
@@ -237,7 +237,7 @@
 		AC_MSG_CHECKING(for gtk+-2.0 libraries)
 		GTK2_LIBS=$(pkg-config --libs gtk+-2.0)
 		AC_MSG_RESULT(${GTK2_LIBS})
-		AC_MSG_CHECKING(for gtk+-2.0 headers)
+		AC_MSG_CHECKING(for gtk+-2.0 includes)
 		GTK2_INCS=$(pkg-config --cflags gtk+-2.0)
 		AC_MSG_RESULT(${GTK2_INCS})
 	else
@@ -248,14 +248,26 @@
 AC_SUBST(GTK2_INCS)
 AM_CONDITIONAL(MAKE_GTK_SUPPORT, test "x$enable_gtk2" = "xyes")
 
-#
-# Check for gtk+-2.0
-#
-AC_ARG_ENABLE([gtk2],
-        AS_HELP_STRING([--enable-gtk2],
-	            [Enable GUIs using gtk+-2.0 framework. [default=no]]),
-        [enable_gtk2=$enableval],
-        [enable_gtk2=no])
+
+### Check for gnutls
+AC_MSG_CHECKING(for gnutls)
+if $(pkg-config --exists gnutls); then
+		AC_MSG_RESULT(yes)
+		AC_MSG_CHECKING(for gnutls libraries)
+		GNUTLS_LIBS=$(pkg-config --libs gnutls)
+		AC_MSG_RESULT(${GNUTLS_LIBS})
+		AC_MSG_CHECKING(for gnutls includes)
+		GNUTLS_INCS=$(pkg-config --cflags gnutls)
+		AC_MSG_RESULT(${GNUTLS_INCS})
+		enable_gnutls=yes
+else
+		AC_MSG_RESULT(no)
+		enable_gnutls=no
+fi
+AC_SUBST(GNULTS_LIBS)
+AC_SUBST(GNUTLS_INCS)
+AM_CONDITIONAL(MAKE_GNUTLS_SUPPORT, test "x$enable_gnutls" = "xyes")
+
         
 ### Check availability of functions, headers and libraries
 

Modified: trunk/src/tests/ccd_connection/Makefile.am
===================================================================
--- trunk/src/tests/ccd_connection/Makefile.am	2008-05-27 22:41:43 UTC (rev 1515)
+++ trunk/src/tests/ccd_connection/Makefile.am	2008-05-28 12:12:42 UTC (rev 1516)
@@ -36,7 +36,8 @@
 
 ccd_connection_gui_DEPENDENCIES                = ${LDADD}
 ccd_connection_gui_SOURCES                     = ccd_connection_gui.c \
-                                                 ccd_connection_funcs.c
+                                                 ccd_connection_funcs.c \
+                                                 ccd_connection_gui_funcs.c
 else 
 # Without GTK
 
@@ -50,4 +51,6 @@
 ccd_connection_SOURCES          = ccd_connection.c \
                                   ccd_connection_funcs.c
 
+SUBDIRS = man1
+
 man_MANS              = man1/ccd_connection.1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.