diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-06-11 19:05:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-06-11 19:05:17 +0000 |
| commit | 350ec69e9afd940b65ef52ab94969e44b1202899 (patch) | |
| tree | e982fc9d135a7673b7cf4ad455fcb0acb281d9e2 /Makefile.am | |
| parent | b30de7bd0bfdc770e88ee92695bd7afe94380b2d (diff) | |
| download | wireshark-350ec69e9afd940b65ef52ab94969e44b1202899.tar.gz wireshark-350ec69e9afd940b65ef52ab94969e44b1202899.tar.bz2 wireshark-350ec69e9afd940b65ef52ab94969e44b1202899.zip | |
Do the Python embedding similarly to other "default = yes, if available"
items.
Add some quoting to the zlib tests, just in case the argument contains
white space.
Clean up capitalization of Lua and Python.
Link programs that use libwireshark with the Python libraries, and build
Epan with the Python cflags.
svn path=/trunk/; revision=37652
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index ac4c031e87..a99ad2d3db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -337,6 +337,7 @@ wireshark_LDADD = \ @KRB5_LIBS@ \ @LAUNCHSERVICES_FRAMEWORKS@ \ @CORESERVICES_FRAMEWORKS@ \ + @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ \ @@ -365,6 +366,7 @@ tshark_LDADD = \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ @CORESERVICES_FRAMEWORKS@ \ + @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ @@ -392,6 +394,7 @@ rawshark_LDADD = \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ @CORESERVICES_FRAMEWORKS@ \ + @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ @@ -457,6 +460,7 @@ dftest_LDADD = \ @C_ARES_LIBS@ \ @ADNS_LIBS@ \ @KRB5_LIBS@ \ + @PY_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @LIBSMI_LDFLAGS@ |