diff --git a/linux/Makefile.am b/linux/Makefile.am
index cc78fa28..14d7917c 100644
--- a/linux/Makefile.am
+++ b/linux/Makefile.am
@@ -268,7 +268,7 @@ ccextractor_CFLAGS = -O3 -std=gnu99 -s  -Wno-write-strings -D_FILE_OFFSET_BITS=6
 ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/utf8proc/
 
 
-ccextractor_LDFLAGS=-lm -zmuldefs
+ccextractor_LDADD=-lm
 
 if SYS_IS_LINUX
 ccextractor_CFLAGS += -DGPAC_CONFIG_LINUX
@@ -276,24 +276,24 @@ endif
 
 if HARDSUBX_IS_ENABLED
 ccextractor_CFLAGS += -DENABLE_HARDSUBX
-ccextractor_CPPFLAGS+= $(shell pkg-config --cflags libavcodec)
-ccextractor_CPPFLAGS+= $(shell pkg-config --cflags libavformat)
-ccextractor_CPPFLAGS+= $(shell pkg-config --cflags libavutil)
-ccextractor_CPPFLAGS+= $(shell pkg-config --cflags libswscale)
-AV_LIB = $(shell pkg-config --libs libavcodec )
-AV_LIB += $(shell pkg-config --libs libavformat )
-AV_LIB += $(shell pkg-config --libs libavutil )
-AV_LIB += $(shell pkg-config --libs libswscale )
-ccextractor_LDFLAGS += $(AV_LIB)
+ccextractor_CPPFLAGS+= ${libavcodec_CFLAGS}
+ccextractor_CPPFLAGS+= ${libavformat_CFLAGS}
+ccextractor_CPPFLAGS+= ${libavutil_CFALGS}
+ccextractor_CPPFLAGS+= ${libswscale_CFLAGS}
+AV_LIB = ${libavcodec_LIBS}
+AV_LIB += ${libavformat_LIBS}
+AV_LIB += ${libavutil_LIBS}
+AV_LIB += ${libswscale_LIBS}
+ccextractor_LDADD += $(AV_LIB)
 endif
 
 if OCR_IS_ENABLED
-ccextractor_CFLAGS += -DENABLE_OCR -DPNG_NO_CONFIG_H
-LEPT_LIB = $(shell pkg-config --libs lept)
+ccextractor_CFLAGS += -DENABLE_OCR -DPN3G_NO_CONFIG_H
+LEPT_LIB = ${lept_LIBS}
 
 if TESSERACT_PRESENT
-TESS_LIB = $(shell pkg-config --libs tesseract)
-TESS_CPPFLAG = $(shell pkg-config --cflags tesseract)
+TESS_LIB = ${tesseract_LIBS}
+TESS_CPPFLAG = ${tesseract_CFLAGS}
 else
 
 #fix for raspberry pi not having a pkgconfig file for tesseract
@@ -306,8 +306,8 @@ endif
 
 ccextractor_CPPFLAGS  += $(TESS_CPPFLAG)
 ccextractor_CPPFLAGS  += $(shell pkg-config --cflags lept)
-ccextractor_LDFLAGS += $(TESS_LIB)
-ccextractor_LDFLAGS += $(LEPT_LIB)
+ccextractor_LDADD += $(TESS_LIB)
+ccextractor_LDADD += $(LEPT_LIB)
 endif
 
 EXTRA_DIST = ../src/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/utf8proc/utf8proc_data.c
diff --git a/linux/configure.ac b/linux/configure.ac
index 933e0123..7c9d8d2e 100644
--- a/linux/configure.ac
+++ b/linux/configure.ac
@@ -15,12 +15,12 @@ AC_PROG_MAKE_SET
 
 # Checks for libraries.
 AC_CHECK_LIB([m], [sin], [], [AC_MSG_ERROR(Math library not installed. Install it before proceeding.)])
-AC_CHECK_LIB([lept], [getLeptonicaVersion], [HAS_LEPT=1], [HAS_LEPT=0])
-AC_CHECK_LIB([tesseract], [TessVersion], [HAS_TESSERACT=1], [HAS_TESSERACT=0])
-AC_CHECK_LIB([avcodec], [avcodec_version], [HAS_AVCODEC=1], [HAS_AVCODEC=0])
-AC_CHECK_LIB([avformat], [avformat_version], [HAS_AVFORMAT=1], [HAS_AVFORMAT=0])
-AC_CHECK_LIB([avutil], [avutil_version], [HAS_AVUTIL=1], [HAS_AVUTIL=0])
-AC_CHECK_LIB([swscale], [swscale_version], [HAS_SWSCALE=1], [HAS_SWSCALE=0])
+AC_CHECK_LIB([lept], [getLeptonicaVersion], [HAS_LEPT=1 && PKG_CHECK_MODULES([lept], [lept])], [HAS_LEPT=0])
+AC_CHECK_LIB([tesseract], [TessVersion], [HAS_TESSERACT=1 && PKG_CHECK_MODULES([tesseract], [tesseract])], [HAS_TESSERACT=0])
+AC_CHECK_LIB([avcodec], [avcodec_version], [HAS_AVCODEC=1 && PKG_CHECK_MODULES([libavcodec], [libavcodec])], [HAS_AVCODEC=0])
+AC_CHECK_LIB([avformat], [avformat_version], [HAS_AVFORMAT=1 && PKG_CHECK_MODULES([libavformat], [libavformat])], [HAS_AVFORMAT=0])
+AC_CHECK_LIB([avutil], [avutil_version], [HAS_AVUTIL=1 && PKG_CHECK_MODULES([libavutil], [libavutril])], [HAS_AVUTIL=0])
+AC_CHECK_LIB([swscale], [swscale_version], [HAS_SWSCALE=1 && PKG_CHECK_MODULES([libswscale], [libswscale])], [HAS_SWSCALE=0])
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h inttypes.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h termios.h unistd.h wchar.h])