PR10209: extend configury for --disable-translator

* configure.ac: Added --disable-translator feature, creates AM_CONDITIONAL BUILD_TRANSLATOR.
* Makefile.am: Only build runtime components (staprun, stapio) if BUILD_TRANSLATOR == FALSE.
* configure: Regenerated.
* Makefile.in: Likewise.
* aclocal.m4: Likewise.
* config.in: Likewise.
* doc/Makefile.in: Likewise.
* doc/SystemTap_Tapset_Reference/Makefile.in: Likewise.
* grapher/Makefile.in: Likewise.

1 files changed, 134 insertions, 107 deletions

diff --git a/Makefile.in b/Makefile.in
index c8a5d713..a3789c6c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34,30 +34,33 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-bin_PROGRAMS = stap$(EXEEXT) staprun$(EXEEXT) $(am__EXEEXT_1)
-@BUILD_SERVER_TRUE@am__append_1 = stap-server.8 
-@BUILD_SERVER_TRUE@am__append_2 = stap-client-connect stap-server-connect
-@BUILD_SERVER_TRUE@am__append_3 = stap-client stap-serverd stap-server stap-find-servers \
-@BUILD_SERVER_TRUE@	       stap-start-server stap-find-or-start-server stap-stop-server \
-@BUILD_SERVER_TRUE@	       stap-authorize-server-cert
-
-@HAVE_NSS_TRUE@am__append_4 = modsign.cxx nsscommon.c
-@HAVE_NSS_TRUE@am__append_5 = $(nss_CFLAGS) $(nspr_CFLAGS)
-@HAVE_NSS_TRUE@am__append_6 = -lnss3
-@BUILD_ELFUTILS_TRUE@am__append_7 = -Iinclude-elfutils
-@BUILD_ELFUTILS_TRUE@am__append_8 = -Llib-elfutils -Wl,-rpath-link,lib-elfutils \
-@BUILD_ELFUTILS_TRUE@		-Wl,--enable-new-dtags,-rpath,$(pkglibdir)
-
-@BUILD_ELFUTILS_TRUE@am__append_9 = stamp-elfutils
-@BUILD_ELFUTILS_TRUE@am__append_10 = stamp-elfutils
-@BUILD_ELFUTILS_TRUE@am__append_11 = lib-elfutils/libdw.so
-@BUILD_ELFUTILS_TRUE@am__append_12 = install-elfutils
-@BUILD_SERVER_TRUE@am__append_13 = install-scripts
-@HAVE_NSS_TRUE@am__append_14 = runtime/staprun/modverify.c nsscommon.c
-@HAVE_NSS_TRUE@am__append_15 = $(nss_CFLAGS) $(nspr_CFLAGS)
-@HAVE_NSS_TRUE@am__append_16 = -lnss3
+bin_PROGRAMS = staprun$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
+@BUILD_TRANSLATOR_TRUE@am__append_1 = stap
+@BUILD_TRANSLATOR_TRUE@am__append_2 = stap.1
+@BUILD_TRANSLATOR_TRUE@am__append_3 = dtrace
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_4 = stap-server.8 
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_5 = stap-client-connect stap-server-connect
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_6 = stap-client stap-serverd stap-server stap-find-servers \
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@	       stap-start-server stap-find-or-start-server stap-stop-server \
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@	       stap-authorize-server-cert
+
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_7 = modsign.cxx nsscommon.c
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_8 = $(nss_CFLAGS) $(nspr_CFLAGS)
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__append_9 = -lnss3
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_10 = -Iinclude-elfutils
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_11 = -Llib-elfutils -Wl,-rpath-link,lib-elfutils \
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@		-Wl,--enable-new-dtags,-rpath,$(pkglibdir)
+
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_12 = stamp-elfutils
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_13 = stamp-elfutils
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_14 = lib-elfutils/libdw.so
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_15 = install-elfutils
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@am__append_16 = install-scripts
+@HAVE_NSS_TRUE@am__append_17 = runtime/staprun/modverify.c nsscommon.c
+@HAVE_NSS_TRUE@am__append_18 = $(nss_CFLAGS) $(nspr_CFLAGS)
+@HAVE_NSS_TRUE@am__append_19 = -lnss3
 pkglibexec_PROGRAMS = stapio$(EXEEXT)
-noinst_PROGRAMS = loc2c-test$(EXEEXT)
+@BUILD_TRANSLATOR_TRUE@noinst_PROGRAMS = loc2c-test$(EXEEXT)
 subdir = .
 DIST_COMMON = INSTALL NEWS README AUTHORS $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -96,8 +99,9 @@ CONFIG_CLEAN_FILES = stap.1 stapprobes.3stap stapfuncs.3stap \
 	man/stapprobes.signal.3stap man/stapprobes.socket.3stap \
 	man/stapprobes.tcp.3stap man/stapprobes.udp.3stap \
 	initscript/systemtap run-stap run-staprun
-@BUILD_SERVER_TRUE@am__EXEEXT_1 = stap-client-connect$(EXEEXT) \
-@BUILD_SERVER_TRUE@	stap-server-connect$(EXEEXT)
+@BUILD_TRANSLATOR_TRUE@am__EXEEXT_1 = stap$(EXEEXT)
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@am__EXEEXT_2 = stap-client-connect$(EXEEXT) \
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@	stap-server-connect$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man8dir)" \
@@ -105,37 +109,53 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 pkglibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS)
-am_loc2c_test_OBJECTS = loc2c_test-loc2c-test.$(OBJEXT) \
-	loc2c_test-loc2c.$(OBJEXT)
+@BUILD_TRANSLATOR_TRUE@am_loc2c_test_OBJECTS =  \
+@BUILD_TRANSLATOR_TRUE@	loc2c_test-loc2c-test.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	loc2c_test-loc2c.$(OBJEXT)
 loc2c_test_OBJECTS = $(am_loc2c_test_OBJECTS)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-loc2c_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
+@BUILD_TRANSLATOR_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+@BUILD_TRANSLATOR_TRUE@loc2c_test_DEPENDENCIES =  \
+@BUILD_TRANSLATOR_TRUE@	$(am__DEPENDENCIES_2)
 loc2c_test_LINK = $(CCLD) $(loc2c_test_CFLAGS) $(CFLAGS) \
 	$(loc2c_test_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_NSS_TRUE@am__objects_1 = stap-modsign.$(OBJEXT) \
-@HAVE_NSS_TRUE@	stap-nsscommon.$(OBJEXT)
-am_stap_OBJECTS = stap-main.$(OBJEXT) stap-parse.$(OBJEXT) \
-	stap-staptree.$(OBJEXT) stap-elaborate.$(OBJEXT) \
-	stap-translate.$(OBJEXT) stap-tapsets.$(OBJEXT) \
-	stap-buildrun.$(OBJEXT) stap-loc2c.$(OBJEXT) \
-	stap-hash.$(OBJEXT) stap-mdfour.$(OBJEXT) stap-cache.$(OBJEXT) \
-	stap-util.$(OBJEXT) stap-coveragedb.$(OBJEXT) \
-	stap-dwarf_wrappers.$(OBJEXT) stap-tapset-been.$(OBJEXT) \
-	stap-tapset-procfs.$(OBJEXT) stap-tapset-timers.$(OBJEXT) \
-	stap-tapset-perfmon.$(OBJEXT) stap-tapset-mark.$(OBJEXT) \
-	stap-tapset-itrace.$(OBJEXT) stap-tapset-utrace.$(OBJEXT) \
-	stap-task_finder.$(OBJEXT) stap-dwflpp.$(OBJEXT) \
-	stap-rpm_finder.$(OBJEXT) $(am__objects_1)
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@am__objects_1 =  \
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	stap-modsign.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	stap-nsscommon.$(OBJEXT)
+@BUILD_TRANSLATOR_TRUE@am_stap_OBJECTS = stap-main.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-parse.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-staptree.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-elaborate.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-translate.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-tapsets.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-buildrun.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-loc2c.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-hash.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-mdfour.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-cache.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-util.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-coveragedb.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-dwarf_wrappers.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-tapset-been.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-tapset-procfs.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-tapset-timers.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-tapset-perfmon.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-tapset-mark.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-tapset-itrace.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-tapset-utrace.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-task_finder.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-dwflpp.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	stap-rpm_finder.$(OBJEXT) \
+@BUILD_TRANSLATOR_TRUE@	$(am__objects_1)
 stap_OBJECTS = $(am_stap_OBJECTS)
 stap_LINK = $(CXXLD) $(stap_CXXFLAGS) $(CXXFLAGS) $(stap_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@BUILD_SERVER_TRUE@am_stap_client_connect_OBJECTS = stap_client_connect-stap-client-connect.$(OBJEXT)
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@am_stap_client_connect_OBJECTS = stap_client_connect-stap-client-connect.$(OBJEXT)
 stap_client_connect_OBJECTS = $(am_stap_client_connect_OBJECTS)
 stap_client_connect_DEPENDENCIES =
 stap_client_connect_LINK = $(CCLD) $(stap_client_connect_CFLAGS) \
 	$(CFLAGS) $(stap_client_connect_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_SERVER_TRUE@am_stap_server_connect_OBJECTS = stap_server_connect-stap-server-connect.$(OBJEXT)
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@am_stap_server_connect_OBJECTS = stap_server_connect-stap-server-connect.$(OBJEXT)
 stap_server_connect_OBJECTS = $(am_stap_server_connect_OBJECTS)
 stap_server_connect_DEPENDENCIES =
 stap_server_connect_LINK = $(CCLD) $(stap_server_connect_CFLAGS) \
@@ -322,25 +342,30 @@ pkglibexecdir = ${libexecdir}/${PACKAGE}
 AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DSYSCONFDIR='"$(sysconfdir)"' -DPKGDATADIR='"${pkgdatadir}"' -DPKGLIBDIR='"$(pkglibexecdir)"'
 AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
 AM_CXXFLAGS = -Wall -Werror
-man_MANS = stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap \
+man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap \
 	stapex.3stap staprun.8 man/stapprobes.iosched.3stap \
 	man/stapprobes.netdev.3stap man/stapprobes.nfs.3stap \
 	man/stapprobes.nfsd.3stap man/stapprobes.pagefault.3stap \
 	man/stapprobes.kprocess.3stap man/stapprobes.rpc.3stap \
 	man/stapprobes.scsi.3stap man/stapprobes.signal.3stap \
 	man/stapprobes.socket.3stap man/stapprobes.tcp.3stap \
-	man/stapprobes.udp.3stap $(am__append_1)
+	man/stapprobes.udp.3stap $(am__append_2) $(am__append_4)
 bin_SCRIPTS = stap-report stap-env stap-gen-cert stap-authorize-cert \
-	stap-authorize-signing-cert $(am__append_3) dtrace
+	stap-authorize-signing-cert $(am__append_3) $(am__append_6)
 oldinclude_HEADERS = includes/sys/sdt.h
-stap_SOURCES = main.cxx parse.cxx staptree.cxx elaborate.cxx \
-	translate.cxx tapsets.cxx buildrun.cxx loc2c.c hash.cxx \
-	mdfour.c cache.cxx util.cxx coveragedb.cxx dwarf_wrappers.cxx \
-	tapset-been.cxx tapset-procfs.cxx tapset-timers.cxx \
-	tapset-perfmon.cxx tapset-mark.cxx tapset-itrace.cxx \
-	tapset-utrace.cxx task_finder.cxx dwflpp.cxx rpm_finder.cxx \
-	$(am__append_4)
-stap_LDADD = @stap_LIBS@ @sqlite3_LIBS@ @rpm_LIBS@ $(am__append_6)
+@BUILD_TRANSLATOR_TRUE@stap_SOURCES = main.cxx parse.cxx staptree.cxx \
+@BUILD_TRANSLATOR_TRUE@	elaborate.cxx translate.cxx tapsets.cxx \
+@BUILD_TRANSLATOR_TRUE@	buildrun.cxx loc2c.c hash.cxx mdfour.c \
+@BUILD_TRANSLATOR_TRUE@	cache.cxx util.cxx coveragedb.cxx \
+@BUILD_TRANSLATOR_TRUE@	dwarf_wrappers.cxx tapset-been.cxx \
+@BUILD_TRANSLATOR_TRUE@	tapset-procfs.cxx tapset-timers.cxx \
+@BUILD_TRANSLATOR_TRUE@	tapset-perfmon.cxx tapset-mark.cxx \
+@BUILD_TRANSLATOR_TRUE@	tapset-itrace.cxx tapset-utrace.cxx \
+@BUILD_TRANSLATOR_TRUE@	task_finder.cxx dwflpp.cxx \
+@BUILD_TRANSLATOR_TRUE@	rpm_finder.cxx $(am__append_7)
+@BUILD_TRANSLATOR_TRUE@stap_LDADD = @stap_LIBS@ @sqlite3_LIBS@ \
+@BUILD_TRANSLATOR_TRUE@	@rpm_LIBS@ $(am__append_9)
+@BUILD_TRANSLATOR_TRUE@stap_DEPENDENCIES = $(am__append_14)
 
 # Arrange for git_version.h to be regenerated at every "make".
 # Code fragment is based upon RadeonHD.am.
@@ -350,26 +375,27 @@ stap_LDADD = @stap_LIBS@ @sqlite3_LIBS@ @rpm_LIBS@ $(am__append_6)
 # of foo-bar.c if it is newer than the foo-bar.o file. Using noinst_foo_SOURCES
 # instead of foo_SOURCES prevents shipping git_version.h in dist tarballs,
 # which may cause false GIT_FOO readings.
-BUILT_SOURCES = git_version.stamp $(am__append_9)
-CLEANFILES = git_version.h $(am__append_10) $(pkglibexec_PROGRAMS)
-stap_DEPENDENCIES = $(am__append_11)
+BUILT_SOURCES = git_version.stamp $(am__append_12)
+CLEANFILES = git_version.h $(am__append_13) $(pkglibexec_PROGRAMS)
 GIT_VERSION_CMD = $(SHELL) $(top_srcdir)/git_version.sh
-stap_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@
-stap_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@
-stap_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_5) $(am__append_7)
-stap_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ $(am__append_8)
-@HAVE_NSS_TRUE@stap_client_connect_LDFLAGS = $(AM_LDFLAGS)
-@HAVE_NSS_TRUE@stap_server_connect_LDFLAGS = $(AM_LDFLAGS)
-PHONIES = $(am__append_12) $(am__append_13) dist-gzip
+PHONIES = $(am__append_15) $(am__append_16) dist-gzip
+@BUILD_TRANSLATOR_TRUE@stap_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@
+@BUILD_TRANSLATOR_TRUE@stap_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@
+@BUILD_TRANSLATOR_TRUE@stap_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_8) \
+@BUILD_TRANSLATOR_TRUE@	$(am__append_10)
+@BUILD_TRANSLATOR_TRUE@stap_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ \
+@BUILD_TRANSLATOR_TRUE@	$(am__append_11)
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_client_connect_LDFLAGS = $(AM_LDFLAGS)
+@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_server_connect_LDFLAGS = $(AM_LDFLAGS)
 staprun_SOURCES = runtime/staprun/staprun.c \
 	runtime/staprun/staprun_funcs.c runtime/staprun/ctl.c \
-	runtime/staprun/common.c $(am__append_14)
+	runtime/staprun/common.c $(am__append_17)
 staprun_CPPFLAGS = $(AM_CPPFLAGS)
 staprun_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS) @PIECFLAGS@ \
 	-DSINGLE_THREADED -fno-strict-aliasing -fno-builtin-strftime \
-	$(am__append_15)
+	$(am__append_18)
 staprun_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@
-staprun_LDADD = @PROCFLAGS@ $(am__append_16)
+staprun_LDADD = @PROCFLAGS@ $(am__append_19)
 stapio_SOURCES = runtime/staprun/stapio.c \
 	runtime/staprun/mainloop.c runtime/staprun/common.c \
 	runtime/staprun/ctl.c \
@@ -378,17 +404,17 @@ stapio_SOURCES = runtime/staprun/stapio.c \
 stapio_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS) @PIECFLAGS@ -fno-strict-aliasing -fno-builtin-strftime
 stapio_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@
 stapio_LDADD = @PROCFLAGS@ -lpthread
-@BUILD_SERVER_TRUE@stap_client_connect_SOURCES = stap-client-connect.c
-@BUILD_SERVER_TRUE@stap_client_connect_CFLAGS = -Wall -Werror $(nss_CFLAGS) $(nspr_CFLAGS)
-@BUILD_SERVER_TRUE@stap_client_connect_LDADD = -lssl3
-@BUILD_SERVER_TRUE@stap_server_connect_SOURCES = stap-server-connect.c
-@BUILD_SERVER_TRUE@stap_server_connect_CFLAGS = -Wall -Werror $(nss_CFLAGS) $(nspr_CFLAGS)
-@BUILD_SERVER_TRUE@stap_server_connect_LDADD = -lssl3
-loc2c_test_SOURCES = loc2c-test.c loc2c.c
-loc2c_test_CFLAGS = $(stap_CFLAGS)
-loc2c_test_CPPFLAGS = $(stap_CPPFLAGS)
-loc2c_test_LDFLAGS = $(stap_LDFLAGS)
-loc2c_test_LDADD = $(stap_LDADD)
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@stap_client_connect_SOURCES = stap-client-connect.c
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@stap_client_connect_CFLAGS = -Wall -Werror $(nss_CFLAGS) $(nspr_CFLAGS)
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@stap_client_connect_LDADD = -lssl3
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@stap_server_connect_SOURCES = stap-server-connect.c
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@stap_server_connect_CFLAGS = -Wall -Werror $(nss_CFLAGS) $(nspr_CFLAGS)
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@stap_server_connect_LDADD = -lssl3
+@BUILD_TRANSLATOR_TRUE@loc2c_test_SOURCES = loc2c-test.c loc2c.c
+@BUILD_TRANSLATOR_TRUE@loc2c_test_CFLAGS = $(stap_CFLAGS)
+@BUILD_TRANSLATOR_TRUE@loc2c_test_CPPFLAGS = $(stap_CPPFLAGS)
+@BUILD_TRANSLATOR_TRUE@loc2c_test_LDFLAGS = $(stap_LDFLAGS)
+@BUILD_TRANSLATOR_TRUE@loc2c_test_LDADD = $(stap_LDADD)
 
 # crash(8) extension
 @BUILD_CRASHMOD_TRUE@STAPLOG = staplog.so
@@ -1267,8 +1293,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	  esac; \
 	done; \
 	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
+	  if test -f $$i; then file=$$i; \
+	  else file=$(srcdir)/$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \
 	    1*) ;; \
@@ -1312,8 +1338,8 @@ install-man3: $(man3_MANS) $(man_MANS)
 	  esac; \
 	done; \
 	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
+	  if test -f $$i; then file=$$i; \
+	  else file=$(srcdir)/$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \
 	    3*) ;; \
@@ -1357,8 +1383,8 @@ install-man8: $(man8_MANS) $(man_MANS)
 	  esac; \
 	done; \
 	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
+	  if test -f $$i; then file=$$i; \
+	  else file=$(srcdir)/$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \
 	    8*) ;; \
@@ -1484,7 +1510,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
@@ -1575,6 +1601,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @BUILD_CRASHMOD_FALSE@@BUILD_ELFUTILS_FALSE@@BUILD_SERVER_FALSE@install-exec-local:
+@BUILD_CRASHMOD_FALSE@@BUILD_TRANSLATOR_FALSE@install-exec-local:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic clean-local \
@@ -1693,26 +1720,26 @@ cscope:
 	cd $(srcdir) && \
 	(echo -q ; git ls-files '*.cxx' '*.c' '*.h' | grep -v '^testsuite' ) > cscope.files && \
 	cscope -b -q
-@BUILD_ELFUTILS_TRUE@stamp-elfutils: config.status
-@BUILD_ELFUTILS_TRUE@	$(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all bin_PROGRAMS=
-@BUILD_ELFUTILS_TRUE@	for dir in libelf libebl libdw libdwfl backends; do \
-@BUILD_ELFUTILS_TRUE@	  $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils/$$dir bin_PROGRAMS= install; \
-@BUILD_ELFUTILS_TRUE@	done
-@BUILD_ELFUTILS_TRUE@	touch $@
-@BUILD_ELFUTILS_TRUE@lib-elfutils/libdw.so: stamp-elfutils ;
-@BUILD_ELFUTILS_TRUE@install-elfutils:
-@BUILD_ELFUTILS_TRUE@	mkdir -p $(DESTDIR)$(pkglibdir)
-@BUILD_ELFUTILS_TRUE@	for file in lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so*; do \
-@BUILD_ELFUTILS_TRUE@	   $(INSTALL_PROGRAM) $$file $(DESTDIR)$(pkglibdir); \
-@BUILD_ELFUTILS_TRUE@	done
-@BUILD_ELFUTILS_TRUE@install-exec-local: install-elfutils
-
-@BUILD_SERVER_TRUE@install-exec-local: install-scripts
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@stamp-elfutils: config.status
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	$(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all bin_PROGRAMS=
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	for dir in libelf libebl libdw libdwfl backends; do \
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	  $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils/$$dir bin_PROGRAMS= install; \
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	done
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	touch $@
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@lib-elfutils/libdw.so: stamp-elfutils ;
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@install-elfutils:
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	mkdir -p $(DESTDIR)$(pkglibdir)
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	for file in lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so*; do \
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	   $(INSTALL_PROGRAM) $$file $(DESTDIR)$(pkglibdir); \
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@	done
+@BUILD_ELFUTILS_TRUE@@BUILD_TRANSLATOR_TRUE@install-exec-local: install-elfutils
+
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@install-exec-local: install-scripts
 # scripts should be installed before this rule is run
-@BUILD_SERVER_TRUE@install-scripts: install-binSCRIPTS
-@BUILD_SERVER_TRUE@	for f in $(bin_SCRIPTS); do \
-@BUILD_SERVER_TRUE@	   sed -i -e "/INSTALL-HOOK/d;s,exec_prefix=.*,exec_prefix=$(exec_prefix)/bin/,;s,sysconfdir=.*,sysconfdir=$(sysconfdir)," $(DESTDIR)$(bindir)/$$f; \
-@BUILD_SERVER_TRUE@	done
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@install-scripts: install-binSCRIPTS
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@	for f in $(bin_SCRIPTS); do \
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@	   sed -i -e "/INSTALL-HOOK/d;s,exec_prefix=.*,exec_prefix=$(exec_prefix)/bin/,;s,sysconfdir=.*,sysconfdir=$(sysconfdir)," $(DESTDIR)$(bindir)/$$f; \
+@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@	done
 
 install-exec-hook:
 	if [ `id -u` -eq 0 ]; then chmod 04111 "$(DESTDIR)$(bindir)/staprun"; fi