diff options
| author | Dave Brolley <brolley@redhat.com> | 2010-01-15 12:38:47 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2010-01-15 12:38:47 -0500 |
| commit | 1c0843bd3c697cc6e025bf04279cf09647a680a4 (patch) | |
| tree | 4e43803760aaecb669989c2362c2ce35733a1457 | |
| parent | ceeefadd6874e3d315669a87ec0d05a0ce1f7094 (diff) | |
| parent | 2a1c9b5db533fe7d2d2d4bac572195c490de62fb (diff) | |
| download | systemtap-steved-1c0843bd3c697cc6e025bf04279cf09647a680a4.tar.gz systemtap-steved-1c0843bd3c697cc6e025bf04279cf09647a680a4.tar.xz systemtap-steved-1c0843bd3c697cc6e025bf04279cf09647a680a4.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 8 insertions, 3 deletions
@@ -9688,9 +9688,11 @@ done fi +stap_prefix=$prefix +test "$stap_prefix" = NONE && stap_prefix=$ac_default_prefix cat >>confdefs.h <<_ACEOF -#define STAP_PREFIX "$prefix" +#define STAP_PREFIX "$stap_prefix" _ACEOF diff --git a/configure.ac b/configure.ac index 2c1cfa2e..12db8f80 100644 --- a/configure.ac +++ b/configure.ac @@ -671,8 +671,11 @@ fi dnl This is here mainly to make sure that configure --prefix=... changes dnl the config.h files so files depending on it are recompiled dnl prefix is passed through indirectly in the Makefile.am AM_CPPFLAGS. -dnl Don't use this directly (when not given it is set to NONE). -AC_DEFINE_UNQUOTED(STAP_PREFIX, "$prefix", [configure prefix location]) +dnl Formerly: Don't use this directly (when not given it is set to NONE). +dnl Currently: inline autoconf's later defaulting +stap_prefix=$prefix +test "$stap_prefix" = NONE && stap_prefix=$ac_default_prefix +AC_DEFINE_UNQUOTED(STAP_PREFIX, "$stap_prefix", [configure prefix location]) AC_CONFIG_HEADERS([config.h:config.in]) AC_CONFIG_FILES(Makefile doc/Makefile doc/beginners/Makefile doc/SystemTap_Tapset_Reference/Makefile grapher/Makefile grapher/stapgraph.1 stap.1 stapprobes.3stap stapfuncs.3stap stapvars.3stap stapex.3stap staprun.8 stap-client.8 stap-server.8 stap-authorize-server-cert.8 stap-authorize-signing-cert.8 man/stapprobes.iosched.3stap man/stapprobes.irq.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 man/stapprobes.snmp.3stap initscript/systemtap initscript/stap-server) |