2005-07-25 Roland McGrath <roland@redhat.com>

	* configure.ac: Don't define PKGLIBDIR and PKGDATADIR here.
	* Makefile.am (AM_CPPFLAGS): New variable, use -D here instead.
	(dist-hook): Don't remove ChangeLog files.
	(install-data-local): Don't install docs, just runtime stuff.
	(rpm, clean-local): Use make variables instead of @substitution@s.
	* configure, config.in, aclocal.m4, Makefile.in: Regenerated

diff --git a/ChangeLog b/ChangeLog
index 081bafc005a3291e90db27056cf3563081b149c2..96fc9831b47f9ee66b6653f6339a538e785e95b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-25  Roland McGrath  <roland@redhat.com>
+
+       * configure.ac: Don't define PKGLIBDIR and PKGDATADIR here.
+       * Makefile.am (AM_CPPFLAGS): New variable, use -D here instead.
+       (dist-hook): Don't remove ChangeLog files.
+       (install-data-local): Don't install docs, just runtime stuff.
+       (rpm, clean-local): Use make variables instead of @substitution@s.
+       * configure, config.in, aclocal.m4, Makefile.in: Regenerated
+
 2005-07-22  Graydon Hoare  <graydon@redhat.com>
 
        * translate.cxx (itervar): New class.
@@ -10,7 +19,7 @@
        (semantic_pass_maps): New function to check map usage.
        (semantic_pass): Call it.
        * testsuite/transok/eight.stp: Test 'foreach' loop translation.
-       * testsuite/semko/{thirteen,fourteen,fifteen}.stp: 
+       * testsuite/semko/{thirteen,fourteen,fifteen}.stp:
        Test prohibited forms of foreach loops.
 
 2005-07-21  Martin Hunt  <hunt@redhat.com>
@@ -19,12 +28,12 @@
        (install-data-local): Install docs and probes.
        (docs): New target.
        (rpm): New target.
-       
+
        * configure.ac: Set initial version to 0.1.1.
        (pkglibdir): Set to libexec.
 
        * Makefile.in: Regenerated.
-       
+
 2005-07-20  Graydon Hoare  <graydon@redhat.com>
 
        * elaborate.{cxx,h} (find_array): Remove.
@@ -113,7 +122,7 @@
 2005-07-07  Graydon Hoare  <graydon@redhat.com>
 
        * staptree.{h,cxx} (deep_copy_visitor): New visitor.
-       * elaborate.cxx 
+       * elaborate.cxx
        (derived_probe::derived_probe):
        (alias_expansion_builder::build): Use it.
        * testsuite/semok/fifteen.stp: New test which relies on deep copy.
@@ -167,8 +176,8 @@
        (parser::parse_probe): Likewise.
        * tapsets.{h,cxx}:
        (derived_probe_builder):
-       (match_key): 
-       (match_node): 
+       (match_key):
+       (match_node):
        (alias_derived_probe): Move from here,
        * elaborate.{h,cxx}: to here.
        * elaborate.h (systemtap_session::pattern_root): New member.
@@ -177,7 +186,7 @@
 
 2005-06-23  Graydon Hoare  <graydon@redhat.com>
 
-       * tapsets.cxx 
+       * tapsets.cxx
        (probe_type): New enum.
        (probe_spec): New struct.
        (dwarf_derived_probe): Reorganize a bit, interpret .return.
@@ -192,8 +201,8 @@
        (declare_dwarf_module_entry):
        (deregister_dwarf_module_entry):
        (register_dwarf_module_entry): New functions.
-       (dwarf_derived_probes::emit_probe_entries): 
-       (dwarf_derived_probes::emit_registrations): 
+       (dwarf_derived_probes::emit_probe_entries):
+       (dwarf_derived_probes::emit_registrations):
        (dwarf_derived_probes::emit_deregistrations): Implement.
 
 2005-06-21  Frank Ch. Eigler  <fche@redhat.com>
@@ -218,7 +227,7 @@
        * tapsets.h: New file.
        (derived_probe_builder): Callback for making derived probes.
        (match_key): Component of pattern-matching tree.
-       (match_node): Other component of pattern-matching tree. 
+       (match_node): Other component of pattern-matching tree.
        * tapsets.cxx: Add pattern-matching system for probes.
        (alias_derived_probe): Skeleton for alias probes.
        (dwarf_derived_probe): Skeleton for dwarf probes.
@@ -258,7 +267,7 @@
        (visit_for_loop, *_statement): New implementations.
        * elaborate.*, staptree.cxx: Mechanical changes.
        * testsuite/parseok/ten.stp, semko/twelve.stp, transko/two.stp,
-       transok/five.stp: New tests.    
+       transok/five.stp: New tests.
 
 2005-06-03  Frank Ch. Eigler  <fche@elastic.org>
 
@@ -309,7 +318,7 @@
        * testsuite/*: New/updated tests for syntax changes, foreach ().
 
 2005-05-30  Frank Ch. Eigler  <fche@redhat.com>
-       
+
        More fully parse & elaborate "expr in array" construct.
        * staptree.h (array_in): Make this unary.  Update .cxx to match.
        * parse.cxx (parse_array_in): Rewrite.
@@ -416,7 +425,7 @@
        * staptree.h (expression): Add is_lvalue member.
        * staptree.cxx (functioncall::resolve_types): Don't crash on
        formal-vs-actual argument count mismatch.
-       (*): Add some is_lvalue stub functions.         
+       (*): Add some is_lvalue stub functions.
        * testsuite/*: Some new tests.
 
 2005-03-01  Frank Ch. Eigler  <fche@redhat.com>
@@ -441,4 +450,3 @@
        * parse.cxx, parse.h: New files: parser.
        * staptree.h: New file: semantic object declarations.
        * staptree.cxx: New dummy driver file.
-

diff --git a/Makefile.am b/Makefile.am
index 646796477c6fa78c509c41ed3036c7a2d01f51ba..445f3c6a04c45bb5f74b80e8fa2e22882d3b5273 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,9 @@
 
 AM_MAKEFLAGS = 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)'
 
+AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}/${PACKAGE}"' \
+             -DPKGDATADIR='"${datadir}/${PACKAGE}"'
+
 bin_PROGRAMS = stap
 stap_SOURCES = main.cxx \
        parse.cxx staptree.cxx elaborate.cxx translate.cxx \
@@ -19,19 +22,16 @@ LDADD =
 
 EXTRA_DIST=testsuite runtime $(wildcard $(srcdir)/*.h) systemtap.spec
 dist-hook:
-       find $(distdir) -name CVS -o -name '*~' -o -name '.#*' -o name ChangeLog | xargs rm -rf
+       find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
        find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
 
-pkgdocdir = ${prefix}/share/doc/systemtap
-
 install-data-local:
-       mkdir -p $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgdocdir) $(DESTDIR)$(pkgdocdir)/runtime
-       mkdir -p $(DESTDIR)$(pkgdocdir)/runtime/docs $(DESTDIR)$(pkgdatadir)/runtime/docs
-       cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile $(DESTDIR)$(pkgdatadir)
-       cp -rp $(srcdir)/runtime/probes $(DESTDIR)$(pkgdatadir)/probes
-       cp -rp $(srcdir)/runtime/docs/html/* $(DESTDIR)$(pkgdocdir)/runtime
-       find $(DESTDIR)$(pkgdatadir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
-       find $(DESTDIR)$(pkgdocdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
+       mkdir -p $(DESTDIR)$(pkgdatadir)/runtime
+       cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile \
+              $(DESTDIR)$(pkgdatadir)/runtime
+       tar -f - -c --exclude=CVS --exclude='*~' --exclude='.#*' \
+           -C $(srcdir)/runtime probes \
+       | (cd $(DESTDIR)$(pkgdatadir)/runtime && tar xpf -)
 
 p=$(srcdir)/testsuite/parse
 s=$(srcdir)/testsuite/sem
@@ -56,8 +56,8 @@ docs: runtime/Doxyfile
        cd runtime && doxygen Doxyfile
 
 rpm:   dist docs
-       rpmbuild -ta @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.gz
+       rpmbuild -ta ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz
 
 clean-local:
-       rm -f *.gcov *.gcno *.gcda @PACKAGE_TARNAME@-*.tar.gz
-       rm -rf @PACKAGE_TARNAME@-@PACKAGE_VERSION@
+       rm -f *.gcov *.gcno *.gcda ${PACKAGE_TARNAME}-*.tar.gz
+       rm -rf ${PACKAGE_TARNAME}-${PACKAGE_VERSION}

diff --git a/Makefile.in b/Makefile.in
index 07fc37164934a2d2978ab3b66b5aaa1c2cb9e24d..a8cbcbb889cb0d6739fef180940e2ee1f3c8542a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -141,8 +141,6 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGDATADIR = @PKGDATADIR@
-PKGLIBDIR = @PKGLIBDIR@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -183,6 +181,9 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AM_MAKEFLAGS = 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)'
+AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}/${PACKAGE}"' \
+             -DPKGDATADIR='"${datadir}/${PACKAGE}"'
+
 stap_SOURCES = main.cxx \
        parse.cxx staptree.cxx elaborate.cxx translate.cxx \
        tapsets.cxx buildrun.cxx
@@ -194,7 +195,6 @@ AM_CXXFLAGS = -Wall
 # Get extra libs as needed
 LDADD = 
 EXTRA_DIST = testsuite runtime $(wildcard $(srcdir)/*.h) systemtap.spec
-pkgdocdir = ${prefix}/share/doc/systemtap
 p = $(srcdir)/testsuite/parse
 s = $(srcdir)/testsuite/sem
 t = $(srcdir)/testsuite/trans
@@ -744,17 +744,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
        uninstall-info-am uninstall-libexecPROGRAMS
 
 dist-hook:
-       find $(distdir) -name CVS -o -name '*~' -o -name '.#*' -o name ChangeLog | xargs rm -rf
+       find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
        find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
 
 install-data-local:
-       mkdir -p $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgdocdir) $(DESTDIR)$(pkgdocdir)/runtime
-       mkdir -p $(DESTDIR)$(pkgdocdir)/runtime/docs $(DESTDIR)$(pkgdatadir)/runtime/docs
-       cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile $(DESTDIR)$(pkgdatadir)
-       cp -rp $(srcdir)/runtime/probes $(DESTDIR)$(pkgdatadir)/probes
-       cp -rp $(srcdir)/runtime/docs/html/* $(DESTDIR)$(pkgdocdir)/runtime
-       find $(DESTDIR)$(pkgdatadir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
-       find $(DESTDIR)$(pkgdocdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
+       mkdir -p $(DESTDIR)$(pkgdatadir)/runtime
+       cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile \
+              $(DESTDIR)$(pkgdatadir)/runtime
+       tar -f - -c --exclude=CVS --exclude='*~' --exclude='.#*' \
+           -C $(srcdir)/runtime probes \
+       | (cd $(DESTDIR)$(pkgdatadir)/runtime && tar xpf -)
 
 gcov:
        @$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
@@ -767,11 +766,11 @@ docs:     runtime/Doxyfile
        cd runtime && doxygen Doxyfile
 
 rpm:   dist docs
-       rpmbuild -ta @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.gz
+       rpmbuild -ta ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz
 
 clean-local:
-       rm -f *.gcov *.gcno *.gcda @PACKAGE_TARNAME@-*.tar.gz
-       rm -rf @PACKAGE_TARNAME@-@PACKAGE_VERSION@
+       rm -f *.gcov *.gcno *.gcda ${PACKAGE_TARNAME}-*.tar.gz
+       rm -rf ${PACKAGE_TARNAME}-${PACKAGE_VERSION}
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/aclocal.m4 b/aclocal.m4
index 22795ef4c9950bb8ddf2b073ede58014e5af795c..bd283083bb3650af018bcb72a9e8a16c418f5004 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,23 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
@@ -40,26 +28,15 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.9.2])])
+        [AM_AUTOMAKE_VERSION([1.9.5])])
 
-# AM_AUX_DIR_EXPAND
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
@@ -107,25 +84,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
+# serial 4
 
 # This was merged into AC_PROG_CC in Autoconf.
 
@@ -140,26 +106,16 @@ am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 ])
 AU_DEFUN([fp_PROG_CC_STDC])
 
-# AM_CONDITIONAL                                              -*- Autoconf -*-
+# AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 6
+# serial 7
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -183,26 +139,15 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# serial 7                                             -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+# serial 8
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -211,7 +156,6 @@ fi])])
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
 
-
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
@@ -351,27 +295,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])
 ])
 
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-#   Free Software Foundation, Inc.
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-#serial 2
+#serial 3
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -430,30 +363,19 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Do all the work for Automake.                            -*- Autoconf -*-
+# Do all the work for Automake.                             -*- Autoconf -*-
 
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 12
 
-# serial 11
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
 
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
@@ -555,51 +477,27 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 1
+# serial 2
 
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
@@ -614,28 +512,17 @@ fi
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
-# Add --enable-maintainer-mode option to configure.
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
+# serial 4
 
 AC_DEFUN([AM_MAINTAINER_MODE],
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
@@ -654,26 +541,15 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
-# Check to see how 'make' treats includes.     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Check to see how 'make' treats includes.                 -*- Autoconf -*-
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -717,27 +593,16 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-#  -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -763,27 +628,16 @@ else
 fi
 ])
 
+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
@@ -837,26 +691,15 @@ else
 fi
 AC_SUBST([mkdir_p])])
 
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Helper functions for option handling.                     -*- Autoconf -*-
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -881,26 +724,14 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005
 # Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
+# serial 4
 
 AC_DEFUN([AM_C_PROTOTYPES],
 [AC_REQUIRE([AC_C_PROTOTYPES])
@@ -918,28 +749,16 @@ AC_SUBST(ANSI2KNR)dnl
 
 AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
 
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_SANITY_CHECK
 # ---------------
@@ -982,25 +801,14 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# AM_PROG_INSTALL_STRIP
+# ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
@@ -1023,25 +831,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
+# serial 2
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------

diff --git a/config.in b/config.in
index 9c833723800f8f81126bd3fec679ec60dd45161d..ea913bbf125cfcb49cd66e5c6325022d8637a524 100644 (file)
--- a/config.in
+++ b/config.in
@@ -66,12 +66,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* datadir */
-#undef PKGDATADIR
-
-/* pkglibdir */
-#undef PKGLIBDIR
-
 /* Define to 1 if the C compiler supports function prototypes. */
 #undef PROTOTYPES
 

diff --git a/configure b/configure
index cdf2ac9ea1c627a3bb78323f41e293af48c662e0..93fe0bec9b61110d4feb93fd7ab5cfaa78bafda1 100755 (executable)
--- a/configure
+++ b/configure
@@ -310,7 +310,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB CXXCPP DATE PKGLIBDIR PKGDATADIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB CXXCPP DATE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -5692,27 +5692,6 @@ _ACEOF
 
 
 
-
-# wha?? autoconf 2.59 does not expand these in the expected way
-# my_libexecdir=`eval echo $libexecdir`
-# my_libexecdir="$libexecdir"
-
-my_pkglibdir=${prefix}/libexec/systemtap
-
-cat >>confdefs.h <<_ACEOF
-#define PKGLIBDIR "$my_pkglibdir"
-_ACEOF
-
-
-
-my_pkgdatadir=${prefix}/share/systemtap
-
-cat >>confdefs.h <<_ACEOF
-#define PKGDATADIR "$my_pkgdatadir"
-_ACEOF
-
-
-
           ac_config_headers="$ac_config_headers config.h:config.in"
 
                     ac_config_files="$ac_config_files Makefile systemtap.spec"
@@ -6432,8 +6411,6 @@ s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@CXXCPP@,$CXXCPP,;t t
 s,@DATE@,$DATE,;t t
-s,@PKGLIBDIR@,$PKGLIBDIR,;t t
-s,@PKGDATADIR@,$PKGDATADIR,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF

diff --git a/configure.ac b/configure.ac
index 3ff4b1b3ed7c40abf652ce02d4a80ddf5bed62a0..404479553abaeaa86ae1570f07267ab6dbd49368 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,19 +33,6 @@ date=`date +%Y-%m-%d`
 AC_DEFINE_UNQUOTED(DATE, "$date", [Configuration/build date])
 AC_SUBST(DATE)
 
-
-# wha?? autoconf 2.59 does not expand these in the expected way
-# my_libexecdir=`eval echo $libexecdir`
-# my_libexecdir="$libexecdir"
-
-my_pkglibdir=${prefix}/libexec/systemtap
-AC_DEFINE_UNQUOTED(PKGLIBDIR, "$my_pkglibdir", [pkglibdir])
-AC_SUBST(PKGLIBDIR)
-
-my_pkgdatadir=${prefix}/share/systemtap
-AC_DEFINE_UNQUOTED(PKGDATADIR, "$my_pkgdatadir", [datadir])
-AC_SUBST(PKGDATADIR)
-
 AC_CONFIG_HEADERS([config.h:config.in])
 AC_CONFIG_FILES(Makefile systemtap.spec)
 AC_OUTPUT