Merge "*.pc.in: rename lib_prefix to webp_libname_prefix" into main

7 files changed, 11 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0ef1022..1a2793d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,10 +135,10 @@ set(INSTALLED_LIBRARIES)
 
 if(MSVC)
   # match the naming convention used by nmake
-  set(lib_prefix "lib")
-  set(CMAKE_SHARED_LIBRARY_PREFIX "${lib_prefix}")
-  set(CMAKE_IMPORT_LIBRARY_PREFIX "${lib_prefix}")
-  set(CMAKE_STATIC_LIBRARY_PREFIX "${lib_prefix}")
+  set(webp_libname_prefix "lib")
+  set(CMAKE_SHARED_LIBRARY_PREFIX "${webp_libname_prefix}")
+  set(CMAKE_IMPORT_LIBRARY_PREFIX "${webp_libname_prefix}")
+  set(CMAKE_STATIC_LIBRARY_PREFIX "${webp_libname_prefix}")
 endif()
 
 set(CMAKE_C_VISIBILITY_PRESET hidden)
diff --git a/configure.ac b/configure.ac
index f13e6d52..2280d868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -749,8 +749,8 @@ fi
 
 dnl =========================
 
-dnl Add an empty lib_prefix variable for use in *.pc.in.
-AC_SUBST([lib_prefix])
+dnl Add an empty webp_libname_prefix variable for use in *.pc.in.
+AC_SUBST([webp_libname_prefix])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/webp/config.h])
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile \
diff --git a/sharpyuv/libsharpyuv.pc.in b/sharpyuv/libsharpyuv.pc.in
index b2943297..0fb565a6 100644
--- a/sharpyuv/libsharpyuv.pc.in
+++ b/sharpyuv/libsharpyuv.pc.in
@@ -7,5 +7,5 @@ Name: libsharpyuv
 Description: Library for sharp RGB to YUV conversion
 Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
-Libs: -L${libdir} -l@lib_prefix@sharpyuv
+Libs: -L${libdir} -l@webp_libname_prefix@sharpyuv
 Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
diff --git a/src/demux/libwebpdemux.pc.in b/src/demux/libwebpdemux.pc.in
index 11441911..15ed1763 100644
--- a/src/demux/libwebpdemux.pc.in
+++ b/src/demux/libwebpdemux.pc.in
@@ -8,4 +8,4 @@ Description: Library for parsing the WebP graphics format container
 Version: @PACKAGE_VERSION@
 Requires: libwebp >= 0.2.0
 Cflags: -I${includedir}
-Libs: -L${libdir} -l@lib_prefix@webpdemux
+Libs: -L${libdir} -l@webp_libname_prefix@webpdemux
diff --git a/src/libwebp.pc.in b/src/libwebp.pc.in
index 59e1a403..a755b54e 100644
--- a/src/libwebp.pc.in
+++ b/src/libwebp.pc.in
@@ -8,5 +8,5 @@ Description: Library for the WebP graphics format
 Version: @PACKAGE_VERSION@
 Requires: libsharpyuv
 Cflags: -I${includedir}
-Libs: -L${libdir} -l@lib_prefix@webp
+Libs: -L${libdir} -l@webp_libname_prefix@webp
 Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
diff --git a/src/libwebpdecoder.pc.in b/src/libwebpdecoder.pc.in
index 01078f15..134de0e7 100644
--- a/src/libwebpdecoder.pc.in
+++ b/src/libwebpdecoder.pc.in
@@ -7,5 +7,5 @@ Name: libwebpdecoder
 Description: Library for the WebP graphics format (decode only)
 Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
-Libs: -L${libdir} -l@lib_prefix@webpdecoder
+Libs: -L${libdir} -l@webp_libname_prefix@webpdecoder
 Libs.private: -lm @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
diff --git a/src/mux/libwebpmux.pc.in b/src/mux/libwebpmux.pc.in
index 21a6e7d7..9d4d6e1e 100644
--- a/src/mux/libwebpmux.pc.in
+++ b/src/mux/libwebpmux.pc.in
@@ -8,5 +8,5 @@ Description: Library for manipulating the WebP graphics format container
 Version: @PACKAGE_VERSION@
 Requires: libwebp >= 0.2.0
 Cflags: -I${includedir}
-Libs: -L${libdir} -l@lib_prefix@webpmux
+Libs: -L${libdir} -l@webp_libname_prefix@webpmux
 Libs.private: -lm