ObjFW/ObjOpenSSL
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update buildsys and use rpath for ObjFW

Browse source 
FossilOrigin-Name: 86da8ecd4c06417d69003c8e4a4650ca41fec3de8c0d887824fc512529c0288b
This commit is contained in:
Jonathan Schleifer 2020-10-03 09:58:12 +00:00
parent c87e963d82
commit 49b20773c3
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -26,8 +26,8 @@ CPP="$OBJCPP"
CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)"
OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)"
LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)"
AC_SUBST(OBJFW_LIBS, "$($OBJFW_CONFIG --libs)")
AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$($OBJFW_CONFIG --framework-libs)")
FRAMEWORK_LIBS="$($OBJFW_CONFIG --framework-libs)"
LIBS="$($OBJFW_CONFIG --libs --rpath)"
AX_CHECK_COMPILER_FLAGS(-Wdocumentation,
[OBJCFLAGS="$OBJCFLAGS -Wdocumentation"])
@ -55,12 +55,14 @@ AS_IF([test x"$with_openssl" != x"no" -a x"$with_openssl" != x""], [
OPENSSL_CPPFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
OPENSSL_LIBS="$OPENSSL_LIBS -L$with_openssl/lib"
CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
LIBS="$LIBS -L$with_openssl/lib"
LIBS="-L$with_openssl/lib $LIBS"
FRAMEWORK_LIBS="-L$with_openssl/lib $FRAMEWORK_LIBS"
])
AC_CHECK_LIB(ssl, main, [
OPENSSL_LIBS="$OPENSSL_LIBS -lssl -lcrypto"
LIBS="$LIBS -lssl -lcrypto"
FRAMEWORK_LIBS="$FRAMEWORK_LIBS -lssl -lcrypto"
], [
AC_MSG_ERROR(You need openssl >= 1.0.2 installed!)
], [-lcrypto])