diff options
| author | jstebbins <[email protected]> | 2014-02-09 18:44:12 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2014-02-09 18:44:12 +0000 |
| commit | 09ba1f5a16a4aa5bd663498a2b75c30efc22897d (patch) | |
| tree | 0d4bb6402370b4f2fcbea20e2dfb8803aca7eae9 /gtk | |
| parent | 903357b41263285e03bc83d41f9224d91ab4fb1a (diff) | |
libhb: change libhb.a to libhandbrake.a
On linux, there is a problem with some distros that dynamically link
harfbuzz (libhb) to libass. The name conflicts with our libhb. So this
changes the library name to resolve the conflict.
It only changes libhb.a. It does not affect the windows libraries
hb.lib and hb.dll
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6020 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/configure.ac | 2 | ||||
| -rw-r--r-- | gtk/src/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index a16ceeb6c..c4362c27e 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -179,7 +179,7 @@ case $host in ;; esac -HB_LIBS="-lhb -la52 -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2" +HB_LIBS="-lhandbrake -la52 -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2" if test "x$use_fdk_aac" = "xyes" ; then HB_LIBS+=" -lfdk-aac" diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am index 1320d5b2b..10ce7377a 100644 --- a/gtk/src/Makefile.am +++ b/gtk/src/Makefile.am @@ -112,7 +112,7 @@ endif ghb_LDADD = $(HB_LIBS) $(GHB_LIBS) -ghb_DEPENDENCIES = $(HB_DIR)/libhb/libhb.a +ghb_DEPENDENCIES = $(HB_DIR)/libhb/libhandbrake.a resources.o: resource_data.h |