ObjFW  Check-in [e37212ea80]

Overview
Comment:ofhttp: Fix finding ObjOpenSSL opportunistically
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: e37212ea806c8ce525fafcb2db1df69ef266acc4ecd400ae6fcbb0be5941ad22
User & Date: js on 2021-04-05 21:31:06
Other Links: manifest | tags
Context
2021-04-07
18:44
Rename OFEnumerating to OFEnumeration check-in: 151e4642fe user: js tags: trunk
2021-04-05
21:31
ofhttp: Fix finding ObjOpenSSL opportunistically check-in: e37212ea80 user: js tags: trunk
2021-04-04
18:46
Change -[contentsOfURLAtPath:] to return URLs check-in: 9135c5fcb8 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified utils/ofhttp/Makefile from [ca0ac82289] to [54490626b4].

︙︙
12
13
14
15
16
17
18
19


20
21
22
23
24


${PROG}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFWRT_DEP_LVL2}

CPPFLAGS += -I../../src					\
	    -I../../src/runtime				\
	    -I../../src/exceptions			\
	    -I../..					\
	    -DLANGUAGE_DIR=\"${datadir}/ofhttp/lang\"


LIBS := -L../../src -lobjfw						\
	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
	${LIBS}
LD = ${OBJC}
LDFLAGS += ${LDFLAGS_RPATH}








|
>
>






12
13
14
15
16
17
18
19
20
21
22
23
24
25
26


${PROG}: ${LIBOBJFW_DEP_LVL2} ${LIBOBJFWRT_DEP_LVL2}

CPPFLAGS += -I../../src					\
	    -I../../src/runtime				\
	    -I../../src/exceptions			\
	    -I../..					\
	    -DLANGUAGE_DIR='"${datadir}/ofhttp/lang"'	\
	    -DLIB_PREFIX='"${LIB_PREFIX}"'		\
	    -DLIB_SUFFIX='"${LIB_SUFFIX}"'
LIBS := -L../../src -lobjfw						\
	-L../../src/runtime -L../../src/runtime/linklib ${RUNTIME_LIBS}	\
	${LIBS}
LD = ${OBJC}
LDFLAGS += ${LDFLAGS_RPATH}

Modified utils/ofhttp/OFHTTP.m from [1db0eb477d] to [3e09fbe274].

︙︙
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295

#ifdef OF_HAVE_PLUGINS
+ (void)initialize
{
	if (self != [OFHTTP class])
		return;

	/* Opportunistically try loading ObjOpenSSL and ignore any errors. */
	of_dlopen(@"objopenssl", OF_RTLD_LAZY);
}
#endif

- (instancetype)init
{
	self = [super init];









|








281
282
283
284
285
286
287
288
289
290
291
292
293
294
295

#ifdef OF_HAVE_PLUGINS
+ (void)initialize
{
	if (self != [OFHTTP class])
		return;

	/* Opportunistically try loading ObjOpenSSL and ignore any errors. */
	of_dlopen(@LIB_PREFIX @"objopenssl" @LIB_SUFFIX, OF_RTLD_LAZY);
}
#endif

- (instancetype)init
{
	self = [super init];
︙︙