diff options
| author | Martin Lucina <martin@lucina.net> | 2012-01-23 09:00:29 +0100 |
|---|---|---|
| committer | Martin Lucina <martin@lucina.net> | 2012-01-23 09:00:29 +0100 |
| commit | ba0336b4d129a9e261c95276f89640b3459176bf (patch) | |
| tree | a488f7efb61a6950a462815062c3b0f007f40ff5 /perf/Makefile.in | |
| parent | c3363afa881b46f3df8a6b72ed15cfbac18f4713 (diff) | |
| parent | 4016b657973bba87caf75168ba70aaa85d556487 (diff) | |
Merge commit 'upstream/2.1.11'
Diffstat (limited to 'perf/Makefile.in')
| -rw-r--r-- | perf/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perf/Makefile.in b/perf/Makefile.in index 8635487..db4dfb1 100644 --- a/perf/Makefile.in +++ b/perf/Makefile.in @@ -159,6 +159,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LTVER = @LTVER@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -190,6 +191,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -225,7 +227,6 @@ libzmq_have_asciidoc = @libzmq_have_asciidoc@ libzmq_have_xmlto = @libzmq_have_xmlto@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ |