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
41
42
43
|
--- feh-1.3.4/configure.in
+++ feh-1.3.4/configure.in
@@ -41,11 +41,25 @@
AC_SUBST(GIBLIB_CFLAGS)
dnl Check for Xinerama
-LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg"
-AC_CHECK_LIB(Xext,XMissingExtension)
-AC_CHECK_LIB(Xinerama,XineramaQueryScreens)
-AC_SUBST(HAVE_XINERAMA)
-AC_SUBST(XINERAMA_LIBS)
+AC_ARG_ENABLE(xinerama,
+ AC_HELP_STRING([--disable-xinerama],[disable Xinerama multi screen support]),
+ [
+ if test x"$enableval" = xyes; then
+ with_xinerama="yes"
+ else
+ with_xinerama="no"
+ fi
+ ],
+ [with_xinerama="detect"]
+)
+if test x"$with_xinerama" != xno; then
+ AC_CHECK_LIB(Xext,XMissingExtension,[
+ AC_CHECK_LIB(Xinerama,XineramaQueryScreens,[
+ AC_DEFINE(HAVE_LIBXINERAMA, [], [Enable Xinerama support])
+ LIBS="$LIBS -lXext -lXinerama"
+ ])
+ ])
+fi
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress)
dnl AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ="$AC_LIBOBJ getopt.o getopt1.o"])
--- feh-1.3.4/src/Makefile.am
+++ feh-1.3.4/src/Makefile.am
@@ -1,7 +1,6 @@
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
-LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib -lz -lpng
INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) \
-I$(prefix)/include -I$(includedir) \
-I. -I$(top_srcdir)/src \
|
GitWeb
