Skip to content

Commit

Permalink
shorten prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Jul 15, 2023
1 parent 95a5d76 commit 92af986
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions configure.ac
Expand Up @@ -394,14 +394,14 @@ LIBS="${LIBS} ${LTLIBZ}"

dnl merge the pkg-config private fields into public ones when static-only
if test "x$enable_shared" = "xyes"; then
LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED=
LIBSSH2_PKGCONFIG_LIBS_NO_SHARED=
LIBSSH2_PC_REQUIRES_NO_SHARED=
LIBSSH2_PC_LIBS_NO_SHARED=
else
LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED=$LIBSREQUIRED
LIBSSH2_PKGCONFIG_LIBS_NO_SHARED=$LIBS
LIBSSH2_PC_REQUIRES_NO_SHARED=$LIBSREQUIRED
LIBSSH2_PC_LIBS_NO_SHARED=$LIBS
fi
AC_SUBST(LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED)
AC_SUBST(LIBSSH2_PKGCONFIG_LIBS_NO_SHARED)
AC_SUBST(LIBSSH2_PC_REQUIRES_NO_SHARED)
AC_SUBST(LIBSSH2_PC_LIBS_NO_SHARED)

AC_CONFIG_FILES([Makefile
src/Makefile
Expand Down
4 changes: 2 additions & 2 deletions libssh2.pc.in
Expand Up @@ -14,8 +14,8 @@ Name: libssh2
URL: https://www.libssh2.org/
Description: Library for SSH-based communication
Version: @LIBSSH2VER@
Requires: @LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED@
Requires: @LIBSSH2_PC_REQUIRES_NO_SHARED@
Requires.private: @LIBSREQUIRED@
Libs: -L${libdir} -lssh2 @LIBSSH2_PKGCONFIG_LIBS_NO_SHARED@
Libs: -L${libdir} -lssh2 @LIBSSH2_PC_LIBS_NO_SHARED@
Libs.private: @LIBS@
Cflags: -I${includedir}
8 changes: 4 additions & 4 deletions src/CMakeLists.txt
Expand Up @@ -191,11 +191,11 @@ set(LIBSREQUIRED ${PC_REQUIRES_PRIVATE})
set(LIBS ${PC_LIBS})
# merge the pkg-config private fields into public ones when static-only
if(BUILD_SHARED_LIBS)
set(LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED "")
set(LIBSSH2_PKGCONFIG_LIBS_NO_SHARED "")
set(LIBSSH2_PC_REQUIRES_NO_SHARED "")
set(LIBSSH2_PC_LIBS_NO_SHARED "")
else()
set(LIBSSH2_PKGCONFIG_REQUIRES_NO_SHARED "${PC_REQUIRES_PRIVATE}")
set(LIBSSH2_PKGCONFIG_LIBS_NO_SHARED "${PC_LIBS}")
set(LIBSSH2_PC_REQUIRES_NO_SHARED "${PC_REQUIRES_PRIVATE}")
set(LIBSSH2_PC_LIBS_NO_SHARED "${PC_LIBS}")
endif()
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}")
Expand Down

0 comments on commit 92af986

Please sign in to comment.