mirrors/alsa-tools
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-tools.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

qlo10k1: Fix usage of $x_libraries in acinclude.m4 - it may be empty

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2009-08-31 12:48:22 +02:00
parent 66a02ca943
commit 24b5756c35
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
qlo10k1/acinclude.m4
View file

@ -134,18 +134,23 @@ AC_MSG_RESULT([$QT_IS_EMBEDDED])
QT_GUILINK="" QT_GUILINK=""
QASSISTANTCLIENT_LDADD="-lqassistantclient" QASSISTANTCLIENT_LDADD="-lqassistantclient"
if test -z "$x_libraries"; then
X_PATH=""
else
X_PATH="-L$x_libraries"
fi
case "${host}" in case "${host}" in
*irix*) *irix*)
QT_LIBS="$QT_LIB" QT_LIBS="$QT_LIB"
if test $QT_IS_STATIC = yes ; then if test $QT_IS_STATIC = yes ; then
QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE"
fi fi
;; ;;
*linux*) *linux*)
QT_LIBS="$QT_LIB" QT_LIBS="$QT_LIB"
if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg"
fi fi
;; ;;
@ -154,14 +159,14 @@ case "${host}" in
# Digital Unix (aka DGUX aka Tru64) # Digital Unix (aka DGUX aka Tru64)
QT_LIBS="$QT_LIB" QT_LIBS="$QT_LIB"
if test $QT_IS_STATIC = yes ; then if test $QT_IS_STATIC = yes ; then
QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE"
fi fi
;; ;;
*solaris*) *solaris*)
QT_LIBS="$QT_LIB" QT_LIBS="$QT_LIB"
if test $QT_IS_STATIC = yes ; then if test $QT_IS_STATIC = yes ; then
QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl" QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl"
fi fi
;; ;;