Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-13 15:38:58 +02:00
Code Issues Projects Releases Wiki Activity

2016-05-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed a superfluous dependency on libXi in 'acinclude.m4'.
This commit is contained in:
Fred Gleason 2016-05-13 16:53:01 -04:00
parent df9ac7cff1
commit b272700f84
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -15126,3 +15126,5 @@
2016-05-10 Fred Gleason <fredg@paravelsystems.com> 2016-05-10 Fred Gleason <fredg@paravelsystems.com>
* Updated 'NEWS' * Updated 'NEWS'
* Incremented the package version to 2.13.0. * Incremented the package version to 2.13.0.
2016-05-13 Fred Gleason <fredg@paravelsystems.com>
* Removed a superfluous dependency on libXi in 'acinclude.m4'.

14
acinclude.m4
View File

@ -155,7 +155,7 @@ AC_DEFUN([BNV_HAVE_QT],
bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
fi fi
bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt -lXi $X_EXTRA_LIBS" bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS"
else else
# Use cached value or do search, starting with suggestions from # Use cached value or do search, starting with suggestions from
# the command line # the command line
@ -387,7 +387,7 @@ AC_DEFUN([BNV_PATH_QT_DIRECT],
bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
fi fi
bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt -lXi $X_EXTRA_LIBS" bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS"
else else
# There is no valid definition for $QTDIR as Trolltech likes to see it # There is no valid definition for $QTDIR as Trolltech likes to see it
bnv_qt_dir= bnv_qt_dir=
@ -399,7 +399,7 @@ AC_DEFUN([BNV_PATH_QT_DIRECT],
bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
fi fi
bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt -lXi $X_EXTRA_LIBS" bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS"
else else
# Normally, when there is no traditional Trolltech installation, # Normally, when there is no traditional Trolltech installation,
# the library is installed in a place where the linker finds it # the library is installed in a place where the linker finds it
@ -417,7 +417,7 @@ AC_DEFUN([BNV_PATH_QT_DIRECT],
# See if we find the library without any special options. # See if we find the library without any special options.
# Don't add top $LIBS permanently yet # Don't add top $LIBS permanently yet
bnv_save_LIBS="$LIBS" bnv_save_LIBS="$LIBS"
LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt -lXi $X_EXTRA_LIBS" LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS"
bnv_qt_LIBS="$LIBS" bnv_qt_LIBS="$LIBS"
bnv_save_CXXFLAGS="$CXXFLAGS" bnv_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="-I$bnv_qt_include_dir" CXXFLAGS="-I$bnv_qt_include_dir"
@ -431,7 +431,7 @@ AC_DEFUN([BNV_PATH_QT_DIRECT],
# That did not work. Try the multi-threaded version # That did not work. Try the multi-threaded version
echo "Non-critical error, please neglect the above." >&AC_FD_CC echo "Non-critical error, please neglect the above." >&AC_FD_CC
bnv_qt_lib=qt-mt bnv_qt_lib=qt-mt
LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt -lXi $X_EXTRA_LIBS" LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS"
AC_TRY_LINK([#include <$qt_direct_test_header>], AC_TRY_LINK([#include <$qt_direct_test_header>],
$qt_direct_test_main, $qt_direct_test_main,
[ [
@ -442,7 +442,7 @@ AC_DEFUN([BNV_PATH_QT_DIRECT],
# That did not work. Try the OpenGL version # That did not work. Try the OpenGL version
echo "Non-critical error, please neglect the above." >&AC_FD_CC echo "Non-critical error, please neglect the above." >&AC_FD_CC
bnv_qt_lib=qt-gl bnv_qt_lib=qt-gl
LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt -lXi $X_EXTRA_LIBS" LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS"
AC_TRY_LINK([#include <$qt_direct_test_header>], AC_TRY_LINK([#include <$qt_direct_test_header>],
$qt_direct_test_main, $qt_direct_test_main,
[ [
@ -478,7 +478,7 @@ AC_DEFUN([BNV_PATH_QT_DIRECT],
fi fi
done done
# Try with that one # Try with that one
LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt -lXi $X_EXTRA_LIBS" LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS"
AC_TRY_LINK([#include <$qt_direct_test_header>], AC_TRY_LINK([#include <$qt_direct_test_header>],
$qt_direct_test_main, $qt_direct_test_main,
[ [