Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Do not override previous EXTRA_LIBRARIES

  • Loading branch information...
commit e3955f80f322d1a230638d1711117ab7a2c022cf 1 parent d325078
@iquiw iquiw authored
Showing with 3 additions and 7 deletions.
  1. +1 −1  X11.buildinfo.in
  2. +2 −6 configure.ac
View
2  X11.buildinfo.in
@@ -4,4 +4,4 @@
buildable: @BUILD_PACKAGE_BOOL@
cc-options: @X_CFLAGS@ @CPPFLAGS@
ld-options: @X_LIBS@ @LDFLAGS@
-@EXTRA_LIBRARIES@
+extra-libraries: @EXTRA_LIBRARIES@
View
8 configure.ac
@@ -63,13 +63,11 @@ AC_MSG_RESULT([$with_xinerama])
if test "$with_xinerama" = yes; then
AC_CHECK_HEADERS([X11/extensions/Xinerama.h], [have_xinerama=yes])
if test "$have_xinerama" = yes; then
- EXTRA_LIBRARIES="extra-libraries: Xinerama Xext"
+ EXTRA_LIBRARIES="Xinerama Xext"
else
- EXTRA_LIBRARIES=""
echo "WARNING: Xinerama headers not found. Building without Xinerama support"
fi
else
- EXTRA_LIBRARIES=""
echo "WARNING: Building without Xinerama support per user request"
fi
@@ -88,13 +86,11 @@ AC_MSG_RESULT([$with_xscreensaver])
if test "$with_xscreensaver" = yes; then
AC_CHECK_HEADERS([X11/extensions/scrnsaver.h], [have_xscreensaver=yes])
if test "$have_xscreensaver" = yes; then
- EXTRA_LIBRARIES="extra-libraries: Xss"
+ EXTRA_LIBRARIES="Xss $EXTRA_LIBRARIES"
else
- EXTRA_LIBRARIES=""
echo "WARNING: XScreenSaver headers not found. Building without XScreenSaver support"
fi
else
- EXTRA_LIBRARIES=""
echo "WARNING: Building without XScreenSaver support per user request"
fi
Please sign in to comment.
Something went wrong with that request. Please try again.