]> git.alsa-project.org Git - alsa-tools.git/commitdiff
qlo10k1: Fix usage of $x_libraries in acinclude.m4 - it may be empty
authorJaroslav Kysela <perex@perex.cz>
Mon, 31 Aug 2009 10:48:22 +0000 (12:48 +0200)
committerJaroslav Kysela <perex@perex.cz>
Mon, 31 Aug 2009 10:48:22 +0000 (12:48 +0200)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
qlo10k1/acinclude.m4

index 9b2c11a642b0e46778e6c1fda7c8d47499d54db1..fca1998f9d4ddb5504baceee5f9ed09df8a05a7a 100644 (file)
@@ -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
         ;;