Skip to content

Commit 74f74a3

Browse files
pphaneufpphaneuf
committed
Fix the evhtp detection, and make it required.
1 parent 3a8a09e commit 74f74a3

File tree

2 files changed

+52
-57
lines changed

2 files changed

+52
-57
lines changed

‎Makefile.am‎

Lines changed: 39 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ cpp_server_ct_mirror_LDADD = \
163163
$(json_c_LIBS) \
164164
$(libevent_LIBS) \
165165
$(leveldb_LIBS) \
166-
-lcrypto -lssl -lprotobuf -lsqlite3 -levhtp
166+
-lprotobuf -lsqlite3
167167
cpp_server_ct_mirror_SOURCES = \
168168
cpp/client/async_log_client.cc \
169169
cpp/fetcher/remote_peer.cc \
@@ -189,7 +189,7 @@ cpp_server_ct_server_LDADD = \
189189
$(json_c_LIBS) \
190190
$(libevent_LIBS) \
191191
$(leveldb_LIBS) \
192-
-lcrypto -lssl -lprotobuf -lsqlite3 -levhtp
192+
-lprotobuf -lsqlite3
193193
cpp_server_ct_server_SOURCES = \
194194
cpp/client/async_log_client.cc \
195195
cpp/proto/serializer.cc \
@@ -213,7 +213,7 @@ cpp_tools_ct_clustertool_LDADD = \
213213
cpp/libcore.a \
214214
$(json_c_LIBS) \
215215
$(libevent_LIBS) \
216-
-lprotobuf -lcrypto -lssl -lsqlite3 -levhtp
216+
-lprotobuf -lsqlite3
217217
cpp_tools_ct_clustertool_SOURCES = \
218218
cpp/proto/serializer.cc \
219219
cpp/tools/clustertool_main.cc \
@@ -229,7 +229,7 @@ cpp_client_ct_LDADD = \
229229
cpp/libcore.a \
230230
$(json_c_LIBS) \
231231
$(libevent_LIBS) \
232-
-lprotobuf -lcrypto -lssl -lsqlite3 -levhtp
232+
-lprotobuf -lsqlite3
233233
cpp_client_ct_SOURCES = \
234234
cpp/client/async_log_client.cc \
235235
cpp/client/client.cc \
@@ -248,7 +248,7 @@ cpp_client_ct_SOURCES = \
248248

249249
cpp_server_ct_dns_server_LDADD = \
250250
cpp/libcore.a \
251-
-lprotobuf -lldns -lsqlite3 -lcrypto
251+
-lprotobuf -lldns -lsqlite3
252252
cpp_server_ct_dns_server_SOURCES = \
253253
cpp/proto/serializer.cc \
254254
cpp/server/ct-dns-server.cc \
@@ -272,8 +272,7 @@ cpp_tools_dump_sth_SOURCES = \
272272
cpp_tools_etcd_watch_LDADD = \
273273
cpp/libcore.a \
274274
$(json_c_LIBS) \
275-
$(libevent_LIBS) \
276-
-lcrypto -lssl -levhtp
275+
$(libevent_LIBS)
277276
cpp_tools_etcd_watch_SOURCES = \
278277
cpp/tools/etcd_watch.cc \
279278
cpp/util/json_wrapper.cc \
@@ -282,8 +281,7 @@ cpp_tools_etcd_watch_SOURCES = \
282281
cpp_util_bench_etcd_LDADD = \
283282
cpp/libcore.a \
284283
$(json_c_LIBS) \
285-
$(libevent_LIBS) \
286-
-lcrypto -lssl -levhtp
284+
$(libevent_LIBS)
287285
cpp_util_bench_etcd_SOURCES = \
288286
cpp/util/bench_etcd.cc \
289287
cpp/util/json_wrapper.cc \
@@ -293,7 +291,7 @@ cpp_util_etcd_masterelection_LDADD = \
293291
cpp/libcore.a \
294292
$(json_c_LIBS) \
295293
$(libevent_LIBS) \
296-
-lprotobuf -lcrypto -lssl -levhtp
294+
-lprotobuf
297295
cpp_util_etcd_masterelection_SOURCES = \
298296
cpp/util/etcd_masterelection.cc \
299297
cpp/util/json_wrapper.cc \
@@ -314,7 +312,7 @@ cpp_log_cluster_state_controller_test_LDADD = \
314312
$(json_c_LIBS) \
315313
$(libevent_LIBS) \
316314
$(leveldb_LIBS) \
317-
-lprotobuf -lsqlite3 -lcrypto -lssl -levhtp
315+
-lprotobuf -lsqlite3
318316
cpp_log_cluster_state_controller_test_SOURCES = \
319317
cpp/client/async_log_client.cc \
320318
cpp/log/cluster_state_controller_test.cc \
@@ -332,7 +330,7 @@ cpp_log_database_test_LDADD = \
332330
cpp/libtest.a \
333331
$(libevent_LIBS) \
334332
$(leveldb_LIBS) \
335-
-lprotobuf -lsqlite3 -lcrypto
333+
-lprotobuf -lsqlite3
336334
cpp_log_database_test_SOURCES = \
337335
cpp/log/database_test.cc \
338336
cpp/log/test_signer.cc \
@@ -345,7 +343,7 @@ cpp_log_etcd_consistent_store_test_LDADD = \
345343
cpp/libtest.a \
346344
$(json_c_LIBS) \
347345
$(libevent_LIBS) \
348-
-lprotobuf -lcrypto -lssl -levhtp
346+
-lprotobuf
349347
cpp_log_etcd_consistent_store_test_SOURCES = \
350348
cpp/log/etcd_consistent_store_test.cc \
351349
cpp/proto/serializer.cc \
@@ -361,7 +359,7 @@ cpp_log_file_storage_test_LDADD = \
361359
cpp/libtest.a \
362360
$(libevent_LIBS) \
363361
$(leveldb_LIBS) \
364-
-lprotobuf -lcrypto -lsqlite3
362+
-lprotobuf -lsqlite3
365363
cpp_log_file_storage_test_SOURCES = \
366364
cpp/log/file_storage.cc \
367365
cpp/log/file_storage_test.cc \
@@ -375,7 +373,7 @@ cpp_log_frontend_signer_test_LDADD = \
375373
$(json_c_LIBS) \
376374
$(libevent_LIBS) \
377375
$(leveldb_LIBS) \
378-
-lprotobuf -lcrypto -lssl -lsqlite3 -levhtp
376+
-lprotobuf -lsqlite3
379377
cpp_log_frontend_signer_test_SOURCES = \
380378
cpp/log/frontend_signer_test.cc \
381379
cpp/log/test_signer.cc \
@@ -393,7 +391,7 @@ cpp_log_log_lookup_test_LDADD = \
393391
$(json_c_LIBS) \
394392
$(libevent_LIBS) \
395393
$(leveldb_LIBS) \
396-
-lprotobuf -lcrypto -lssl -lsqlite3 -levhtp
394+
-lprotobuf -lsqlite3
397395
cpp_log_log_lookup_test_SOURCES = \
398396
cpp/log/log_lookup_test.cc \
399397
cpp/log/test_signer.cc \
@@ -409,7 +407,7 @@ cpp_log_log_signer_test_LDADD = \
409407
cpp/libcore.a \
410408
cpp/libtest.a \
411409
$(libevent_LIBS) \
412-
-lprotobuf -lcrypto
410+
-lprotobuf
413411
cpp_log_log_signer_test_SOURCES = \
414412
cpp/log/log_signer_test.cc \
415413
cpp/log/test_signer.cc \
@@ -420,7 +418,7 @@ cpp_log_logged_certificate_test_LDADD = \
420418
cpp/libcore.a \
421419
cpp/libtest.a \
422420
$(libevent_LIBS) \
423-
-lprotobuf -lcrypto
421+
-lprotobuf
424422
cpp_log_logged_certificate_test_SOURCES = \
425423
cpp/log/logged_certificate_test.cc \
426424
cpp/proto/serializer.cc \
@@ -431,7 +429,7 @@ cpp_log_strict_consistent_store_test_LDADD = \
431429
cpp/libtest.a \
432430
$(json_c_LIBS) \
433431
$(libevent_LIBS) \
434-
-lprotobuf -lcrypto -lssl -levhtp
432+
-lprotobuf
435433
cpp_log_strict_consistent_store_test_SOURCES = \
436434
cpp/log/strict_consistent_store_cert.cc \
437435
cpp/log/strict_consistent_store_test.cc \
@@ -446,7 +444,7 @@ cpp_log_tree_signer_test_LDADD = \
446444
$(json_c_LIBS) \
447445
$(libevent_LIBS) \
448446
$(leveldb_LIBS) \
449-
-lprotobuf -lcrypto -lssl -lsqlite3 -levhtp
447+
-lprotobuf -lsqlite3
450448
cpp_log_tree_signer_test_SOURCES = \
451449
cpp/log/test_signer.cc \
452450
cpp/log/tree_signer_test.cc \
@@ -462,7 +460,7 @@ cpp_log_signer_verifier_test_LDADD = \
462460
cpp/libcore.a \
463461
cpp/libtest.a \
464462
$(libevent_LIBS) \
465-
-lprotobuf -lcrypto
463+
-lprotobuf
466464
cpp_log_signer_verifier_test_SOURCES = \
467465
cpp/log/signer_verifier_test.cc \
468466
cpp/log/test_signer.cc \
@@ -473,7 +471,7 @@ cpp_monitor_database_test_LDADD = \
473471
cpp/libcore.a \
474472
cpp/libtest.a \
475473
$(libevent_LIBS) \
476-
-lprotobuf -lcrypto -lsqlite3
474+
-lprotobuf -lsqlite3
477475
cpp_monitor_database_test_SOURCES = \
478476
cpp/log/test_signer.cc \
479477
cpp/monitor/database.cc \
@@ -524,7 +522,7 @@ cpp_server_proxy_test_LDADD = \
524522
cpp/libtest.a \
525523
$(json_c_LIBS) \
526524
$(libevent_LIBS) \
527-
-lprotobuf -lcrypto -lssl -levhtp
525+
-lprotobuf
528526
cpp_server_proxy_test_SOURCES = \
529527
cpp/server/json_output.cc \
530528
cpp/server/proxy.cc \
@@ -537,8 +535,7 @@ cpp_util_etcd_delete_test_LDADD = \
537535
cpp/libcore.a \
538536
cpp/libtest.a \
539537
$(json_c_LIBS) \
540-
$(libevent_LIBS) \
541-
-lcrypto -lssl -levhtp
538+
$(libevent_LIBS)
542539
cpp_util_etcd_delete_test_SOURCES = \
543540
cpp/util/etcd_delete_test.cc \
544541
cpp/util/json_wrapper.cc \
@@ -549,8 +546,7 @@ cpp_util_etcd_test_LDADD = \
549546
cpp/libcore.a \
550547
cpp/libtest.a \
551548
$(json_c_LIBS) \
552-
$(libevent_LIBS) \
553-
-lcrypto -lssl -levhtp
549+
$(libevent_LIBS)
554550
cpp_util_etcd_test_SOURCES = \
555551
cpp/util/etcd_test.cc \
556552
cpp/util/json_wrapper.cc \
@@ -560,8 +556,7 @@ cpp_util_fake_etcd_test_LDADD = \
560556
cpp/libcore.a \
561557
cpp/libtest.a \
562558
$(json_c_LIBS) \
563-
$(libevent_LIBS) \
564-
-lcrypto -lssl -levhtp
559+
$(libevent_LIBS)
565560
cpp_util_fake_etcd_test_SOURCES = \
566561
cpp/util/fake_etcd_test.cc \
567562
cpp/util/json_wrapper.cc \
@@ -580,8 +575,7 @@ cpp_util_json_wrapper_test_SOURCES = \
580575
cpp_util_libevent_wrapper_test_LDADD = \
581576
cpp/libcore.a \
582577
cpp/libtest.a \
583-
$(libevent_LIBS) \
584-
-lcrypto -lssl -levhtp
578+
$(libevent_LIBS)
585579
cpp_util_libevent_wrapper_test_SOURCES = \
586580
cpp/util/libevent_wrapper.cc \
587581
cpp/util/libevent_wrapper_test.cc
@@ -592,7 +586,7 @@ cpp_util_masterelection_test_LDADD = \
592586
$(json_c_LIBS) \
593587
$(libevent_LIBS) \
594588
$(leveldb_LIBS) \
595-
-lprotobuf -lcrypto -lssl -levhtp
589+
-lprotobuf
596590
cpp_util_masterelection_test_SOURCES = \
597591
cpp/util/json_wrapper.cc \
598592
cpp/util/libevent_wrapper.cc \
@@ -603,62 +597,55 @@ cpp_util_masterelection_test_SOURCES = \
603597
cpp_merkletree_merkle_tree_test_LDADD = \
604598
cpp/libcore.a \
605599
cpp/libtest.a \
606-
$(libevent_LIBS) \
607-
-lcrypto -lssl -levhtp
600+
$(libevent_LIBS)
608601
cpp_merkletree_merkle_tree_test_SOURCES = \
609602
cpp/util/util.cc \
610603
cpp/merkletree/merkle_tree_test.cc
611604

612605
cpp_merkletree_serial_hasher_test_LDADD = \
613606
cpp/libcore.a \
614607
cpp/libtest.a \
615-
$(libevent_LIBS) \
616-
-lcrypto -lssl -levhtp
608+
$(libevent_LIBS)
617609
cpp_merkletree_serial_hasher_test_SOURCES = \
618610
cpp/util/util.cc \
619611
cpp/merkletree/serial_hasher_test.cc
620612

621613
cpp_merkletree_tree_hasher_test_LDADD = \
622614
cpp/libcore.a \
623615
cpp/libtest.a \
624-
$(libevent_LIBS) \
625-
-lcrypto -lssl -levhtp
616+
$(libevent_LIBS)
626617
cpp_merkletree_tree_hasher_test_SOURCES = \
627618
cpp/util/util.cc \
628619
cpp/merkletree/tree_hasher_test.cc
629620

630621
cpp_util_sync_task_test_LDADD = \
631622
cpp/libcore.a \
632623
cpp/libtest.a \
633-
$(libevent_LIBS) \
634-
-lcrypto -lssl -levhtp
624+
$(libevent_LIBS)
635625
cpp_util_sync_task_test_SOURCES = \
636626
cpp/util/sync_task_test.cc \
637627
cpp/util/thread_pool.cc
638628

639629
cpp_util_task_test_LDADD = \
640630
cpp/libcore.a \
641631
cpp/libtest.a \
642-
$(libevent_LIBS) \
643-
-lcrypto -lssl -levhtp
632+
$(libevent_LIBS)
644633
cpp_util_task_test_SOURCES = \
645634
cpp/util/task_test.cc \
646635
cpp/util/thread_pool.cc
647636

648637
cpp_util_thread_pool_test_LDADD = \
649638
cpp/libcore.a \
650639
cpp/libtest.a \
651-
$(libevent_LIBS) \
652-
-lcrypto -lssl -levhtp
640+
$(libevent_LIBS)
653641
cpp_util_thread_pool_test_SOURCES = \
654642
cpp/util/thread_pool_test.cc \
655643
cpp/util/thread_pool.cc
656644

657645
cpp_log_cert_checker_test_LDADD = \
658646
cpp/libcore.a \
659647
cpp/libtest.a \
660-
$(libevent_LIBS) \
661-
-lcrypto -lssl -levhtp
648+
$(libevent_LIBS)
662649
cpp_log_cert_checker_test_SOURCES = \
663650
cpp/log/cert_checker_test.cc \
664651
cpp/util/openssl_util.cc \
@@ -668,7 +655,7 @@ cpp_log_cert_submission_handler_test_LDADD = \
668655
cpp/libcore.a \
669656
cpp/libtest.a \
670657
$(libevent_LIBS) \
671-
-lprotobuf -lcrypto -lssl -levhtp
658+
-lprotobuf
672659
cpp_log_cert_submission_handler_test_SOURCES = \
673660
cpp/log/cert_submission_handler_test.cc \
674661
cpp/util/openssl_util.cc \
@@ -677,8 +664,7 @@ cpp_log_cert_submission_handler_test_SOURCES = \
677664
cpp_log_cert_test_LDADD = \
678665
cpp/libcore.a \
679666
cpp/libtest.a \
680-
$(libevent_LIBS) \
681-
-lcrypto -lssl -levhtp
667+
$(libevent_LIBS)
682668
cpp_log_cert_test_SOURCES = \
683669
cpp/log/cert_test.cc \
684670
cpp/util/openssl_util.cc \
@@ -687,8 +673,7 @@ cpp_log_cert_test_SOURCES = \
687673
cpp_log_ct_extensions_test_LDADD = \
688674
cpp/libcore.a \
689675
cpp/libtest.a \
690-
$(libevent_LIBS) \
691-
-lcrypto -lssl -levhtp
676+
$(libevent_LIBS)
692677
cpp_log_ct_extensions_test_SOURCES = \
693678
cpp/log/ct_extensions_test.cc \
694679
cpp/util/openssl_util.cc \
@@ -699,7 +684,7 @@ cpp_log_database_large_test_LDADD = \
699684
cpp/libtest.a \
700685
$(libevent_LIBS) \
701686
$(leveldb_LIBS) \
702-
-lprotobuf -lcrypto -lssl -lsqlite3 -levhtp
687+
-lprotobuf -lsqlite3
703688
cpp_log_database_large_test_SOURCES = \
704689
cpp/log/database_large_test.cc \
705690
cpp/log/test_signer.cc \
@@ -713,7 +698,7 @@ cpp_log_frontend_test_LDADD = \
713698
$(json_c_LIBS) \
714699
$(libevent_LIBS) \
715700
$(leveldb_LIBS) \
716-
-lprotobuf -lcrypto -lssl -lsqlite3 -levhtp
701+
-lprotobuf -lsqlite3
717702
cpp_log_frontend_test_SOURCES = \
718703
cpp/log/frontend_test.cc \
719704
cpp/log/test_signer.cc \
@@ -729,8 +714,7 @@ cpp_log_frontend_test_SOURCES = \
729714
cpp_merkletree_merkle_tree_large_test_LDADD = \
730715
cpp/libcore.a \
731716
cpp/libtest.a \
732-
$(libevent_LIBS) \
733-
-lcrypto -lssl -levhtp
717+
$(libevent_LIBS)
734718
cpp_merkletree_merkle_tree_large_test_SOURCES = \
735719
cpp/merkletree/merkle_tree_large_test.cc \
736720
cpp/util/util.cc

0 commit comments

Comments
 (0)