From 24b5756c35428a2f17781de3a77bba783f1c6e71 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 31 Aug 2009 12:48:22 +0200 Subject: [PATCH] qlo10k1: Fix usage of $x_libraries in acinclude.m4 - it may be empty Signed-off-by: Jaroslav Kysela --- qlo10k1/acinclude.m4 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/qlo10k1/acinclude.m4 b/qlo10k1/acinclude.m4 index 9b2c11a..fca1998 100644 --- a/qlo10k1/acinclude.m4 +++ b/qlo10k1/acinclude.m4 @@ -134,18 +134,23 @@ AC_MSG_RESULT([$QT_IS_EMBEDDED]) QT_GUILINK="" QASSISTANTCLIENT_LDADD="-lqassistantclient" +if test -z "$x_libraries"; then + X_PATH="" +else + X_PATH="-L$x_libraries" +fi case "${host}" in *irix*) QT_LIBS="$QT_LIB" 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 ;; *linux*) QT_LIBS="$QT_LIB" 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 ;; @@ -154,14 +159,14 @@ case "${host}" in # Digital Unix (aka DGUX aka Tru64) QT_LIBS="$QT_LIB" 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 ;; *solaris*) QT_LIBS="$QT_LIB" 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 ;; -- 2.47.1