Attachment #215672 for bug #248556




AC_PATH_X
AC_PATH_XTRA

CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
DATADIR=$datadir
dnl Checks for X libraries.
AC_CHECK_LIB([X11], [XOpenDisplay], ,
             AC_MSG_ERROR(XOpenDisplay not found in -lX11), )

LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"

dnl Checks for header files.
AC_HEADER_STDC

Lines 1-5 Link Here

(-)bbweather-0.6.2.orig/Makefile.am (-3 / +3 lines)
1	CPPFLAGS = @CPPFLAGS@ \	1	CPPFLAGS = -DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
2	-DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
3	-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbweather.nobb\"	2	-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbweather.nobb\"
4		3
5		4
Lines 13-16 Link Here
13	Basewindow.cpp Basewindow.h \	12	Basewindow.cpp Basewindow.h \
14	blackboxstyle.h	13	blackboxstyle.h
15	EXTRA_DIST = BUGS TODO	14	EXTRA_DIST = BUGS TODO
16	bbweather_LDADD = @X_LIBS@	15	bbweather_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
		16	bbweather_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@

Return to bug 248556

Lines 56-70 Link Here

(-)bbweather-0.6.2.orig/configure.in (-7 / +2 lines)
56	AC_PATH_X	56	AC_PATH_X
57	AC_PATH_XTRA	57	AC_PATH_XTRA
58		58
59	CFLAGS="$CFLAGS $X_CFLAGS"
60	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
61	LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
62	DATADIR=$datadir	59	DATADIR=$datadir
63	dnl Checks for X libraries.	60	dnl Checks for X libraries.
64	AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",	61	AC_CHECK_LIB([X11], [XOpenDisplay], ,
65	AC_MSG_ERROR(XOpenDisplay not found in -lX11))	62	AC_MSG_ERROR(XOpenDisplay not found in -lX11), )
66
67	LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
68		63
69	dnl Checks for header files.	64	dnl Checks for header files.
70	AC_HEADER_STDC	65	AC_HEADER_STDC