diff options
| author | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
| commit | 2d9b1c592ff7319ee9d6520c9df4838087522e05 (patch) | |
| tree | 6eec7e633840b5b60cc85e20f6365df0702e6911 /protobuf-lite.pc.in | |
| parent | 8a888922a9ac181a3fb47d00d497cde85ec4987a (diff) | |
| parent | 38da6583b1416a7c1594bffec3cdbb8856a72353 (diff) | |
| download | protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.gz protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.bz2 protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.zip | |
Merge pull request #382 from jtattermusch/integrate_from_master
Integrate changes from latest master branch into csharp branch.
Diffstat (limited to 'protobuf-lite.pc.in')
| -rw-r--r-- | protobuf-lite.pc.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/protobuf-lite.pc.in b/protobuf-lite.pc.in index 29c218e5..80f1f461 100644 --- a/protobuf-lite.pc.in +++ b/protobuf-lite.pc.in @@ -8,6 +8,4 @@ Description: Google's Data Interchange Format Version: @VERSION@ Libs: -L${libdir} -lprotobuf-lite @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ Cflags: -I${includedir} @PTHREAD_CFLAGS@ -# Commented out because it crashes pkg-config *sigh*: -# http://bugs.freedesktop.org/show_bug.cgi?id=13265 -# Conflicts: protobuf +Conflicts: protobuf |