diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
| commit | 41113108303afbc1458c1c82b267cc17703ea8ce (patch) | |
| tree | 70ee5f7e6d383fbc5f125daf1b54e1e0766ab1b1 /protobuf.pc.in | |
| parent | 3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (diff) | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
| download | protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.gz protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.bz2 protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.zip | |
Merge branch 'master' of github.com:google/protobuf into integrate_from_master
Diffstat (limited to 'protobuf.pc.in')
| -rw-r--r-- | protobuf.pc.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/protobuf.pc.in b/protobuf.pc.in index 29f24877..49014903 100644 --- a/protobuf.pc.in +++ b/protobuf.pc.in @@ -9,6 +9,4 @@ Version: @VERSION@ Libs: -L${libdir} -lprotobuf @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ Libs.private: @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-lite +Conflicts: protobuf-lite |