[Tkabber-dev] [tclgpg commit] r47 - trunk

codesite-noreply at google.com codesite-noreply at google.com
Sun Nov 23 19:45:44 MSK 2008


Author: sgolovan
Date: Sun Nov 23 08:44:40 2008
New Revision: 47

Modified:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/configure.in

Log:
	* Makefile.in, configure.in: Made building C-helper which spawns gpg
	  process optional (thanks to Konstantin Khomoutov).


Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sun Nov 23 08:44:40 2008
@@ -2,6 +2,9 @@

  	* doc/gpg.man, Makefile.in: Moved manpage to doc subdirectory.

+	* Makefile.in, configure.in: Made building C-helper which spawns gpg
+	  process optional (thanks to Konstantin Khomoutov).
+
  2008-11-22  Sergei Golovan  <sgolovan at nes.ru>

  	* *: Started to convert the package to a proper TEA package.

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Sun Nov 23 08:44:40 2008
@@ -63,7 +63,11 @@
  PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@

  lib_BINARIES	= $(PKG_LIB_FILE)
-BINARIES	= $(lib_BINARIES)
+ifeq (@BUILD_C_HELPER@, yes)
+    BINARIES	= $(lib_BINARIES)
+else
+    BINARIES	=
+endif

  SHELL		= @SHELL@

@@ -113,8 +117,6 @@
  #TCL_DEFS	= @TCL_DEFS@
  TCL_BIN_DIR	= @TCL_BIN_DIR@
  TCL_SRC_DIR	= @TCL_SRC_DIR@
-#TK_BIN_DIR	= @TK_BIN_DIR@
-#TK_SRC_DIR	= @TK_SRC_DIR@

  # Not used, but retained for reference of what libs Tcl required
  #TCL_LIBS	= @TCL_LIBS@
@@ -127,7 +129,6 @@
  #========================================================================

  EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
-#EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
  TCLLIBPATH	= $(top_builddir)
  TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library`
  PKG_ENV		= @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
@@ -137,14 +138,9 @@
  TCLSH_PROG	= @TCLSH_PROG@
  TCLSH   	= $(PKG_ENV) $(TCLSH_ENV) $(TCLSH_PROG)

-#WISH_ENV	= TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
-#WISH_PROG	= @WISH_PROG@
-#WISH   	= $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
-
  SHARED_BUILD	= @SHARED_BUILD@

  INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@
-#INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@

  PKG_CFLAGS	= @PKG_CFLAGS@


Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Nov 23 08:44:40 2008
@@ -20,6 +20,19 @@

  AC_CONFIG_AUX_DIR(tclconfig)

+AC_MSG_CHECKING([whether to build a C helper to run gpg binary])
+AC_ARG_ENABLE([c-helper],
+	AC_HELP_STRING([--enable-c-helper],
+		[Compile C helper to run gpg binary (deault: yes).
+		 If this helper is not built the extension will require
+		 either Tcl >= 8.6 or the presence of Tclx extension
+		 or the presence of tclpipe extension.]),
+	[BUILD_C_HELPER=$enableval],
+	[BUILD_C_HELPER=yes])
+echo "${BUILD_C_HELPER}"
+
+AC_SUBST(BUILD_C_HELPER)
+
  #--------------------------------------------------------------------
  # Load the tclConfig.sh file
  #--------------------------------------------------------------------
@@ -35,15 +48,6 @@
  TEA_PREFIX

  #-----------------------------------------------------------------------
-# Standard compiler checks.
-# This sets up CC by using the CC env var, or looks for gcc otherwise.
-# This also calls AC_PROG_CC, AC_PROG_INSTALL and a few others to create
-# the basic setup necessary to compile executables.
-#-----------------------------------------------------------------------
-
-TEA_SETUP_COMPILER
-
-#-----------------------------------------------------------------------
  # Specify the C source files to compile in TEA_ADD_SOURCES,
  # public headers that need to be installed in TEA_ADD_HEADERS,
  # stub library C source files to compile in TEA_ADD_STUB_SOURCES,
@@ -60,6 +64,18 @@
  TEA_ADD_STUB_SOURCES([])
  TEA_ADD_TCL_SOURCES([tclgpg.tcl])

+CLEANFILES="$CLEANFILES doc/*.n"
+
+if test "${BUILD_C_HELPER}" = "yes" ; then
+#-----------------------------------------------------------------------
+# Standard compiler checks.
+# This sets up CC by using the CC env var, or looks for gcc otherwise.
+# This also calls AC_PROG_CC, AC_PROG_INSTALL and a few others to create
+# the basic setup necessary to compile executables.
+#-----------------------------------------------------------------------
+
+TEA_SETUP_COMPILER
+
  #--------------------------------------------------------------------
  # A few miscellaneous platform-specific items:
  #
@@ -151,6 +167,7 @@
  # the Makefile should not be making use of these paths to generate
  # a pkgIndex.tcl file or anything else at extension build time.
  #--------------------------------------------------------------------
+fi

  TEA_PROG_TCLSH



More information about the Tkabber-dev mailing list