1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Fix configure check that appended -lX11 to $LDFLAGS instead of allowing the
default handling that appended it to $LIBS.
https://bugs.gentoo.org/show_bug.cgi?id=338936
Patch written by Kevin Pyle
--- configure.in
+++ configure.in
@@ -89,13 +89,10 @@
CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
dnl Checks for X libraries.
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+AC_CHECK_LIB(X11, XOpenDisplay,,
AC_MSG_ERROR(XOpenDisplay not found in -lX11))
-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
-
dnl Check for Imlib
AC_MSG_CHECKING([for Imlib])
AC_ARG_WITH(imlib,[ --with-imlib[=path] Use Imlib for images [path to imlib-config]],
--- Makefile.am
+++ Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = @CPPFLAGS@ @INTERLACE@ \
+AM_CPPFLAGS = @INTERLACE@ \
-DGLOBAL_BB=\"$(datadir)/bbtools/bbacpi.bb\" \
-DGLOBAL_NOBB=\"$(datadir)/bbtools/bbacpi.nobb\" \
-DGLOBAL_DATA=\"$(datadir)/bbtools\"
@@ -18,7 +18,7 @@
Basemenu.cc Basemenu.hh \
blackboxstyle.hh
EXTRA_DIST = BUGS TODO
-bbacpi_LDADD = @X_LIBS@
+bbacpi_LDADD = @X_PRE_LIBS@ @X_LIBS@
if USE_IMLIB
AM_CPPFLAGS += @IMAGE_CFLAGS@ -D__IMLIB
|
GitWeb
