Attachment #215665 for bug #248555




AC_PATH_X
AC_PATH_XTRA

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], ,
             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

(-)bbtime-0.1.5.orig/Makefile.am (-3 / +3 lines)
1	CPPFLAGS = @CPPFLAGS@ \	1	AM_CPPFLAGS = -DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \
2	-DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \
3	-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbtime.nobb\"	2	-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbtime.nobb\"
4		3
5		4
Lines 14-17 Link Here
14	timemenu.cc timemenu.hh \	13	timemenu.cc timemenu.hh \
15	blackboxstyle.hh	14	blackboxstyle.hh
16	EXTRA_DIST = BUGS TODO	15	EXTRA_DIST = BUGS TODO
17	bbtime_LDADD = @X_LIBS@	16	bbtime_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
		17	bbtime_CFLAGS = @X_PRE_CFLAGS@ @X_CGLAGS@ @X_EXTRA_CFLAGS@

Return to bug 248555

Lines 47-60 Link Here

(-)bbtime-0.1.5.orig/configure.in (-7 / +2 lines)
47	AC_PATH_X	47	AC_PATH_X
48	AC_PATH_XTRA	48	AC_PATH_XTRA
49		49
50	CFLAGS="$CFLAGS $X_CFLAGS"
51	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
52	LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
53	dnl Checks for X libraries.	50	dnl Checks for X libraries.
54	AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",	51	AC_CHECK_LIB([X11], [XOpenDisplay], ,
55	AC_MSG_ERROR(XOpenDisplay not found in -lX11))	52	AC_MSG_ERROR(XOpenDisplay not found in -lX11),)
56
57	LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
58		53
59	dnl Checks for header files.	54	dnl Checks for header files.
60	AC_HEADER_STDC	55	AC_HEADER_STDC