Attachment #91176 for bug #139594

Lines 1-4 Link Here

(-)feh-1.3.4.original/aclocal.m4 (-2 / +2 lines)
1	dnl aclocal.m4 generated automatically by aclocal 1.4-p6	1	dnl aclocal.m4t generated automatically by aclocal 1.4-p6
2		2
3	dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.	3	dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
4	dnl This file is free software; the Free Software Foundation	4	dnl This file is free software; the Free Software Foundation
Lines 153-159 Link Here
153	dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])	153	dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
154	dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS	154	dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
155	dnl	155	dnl
156	AC_DEFUN(AM_PATH_GTK,	156	AC_DEFUN([AM_PATH_GTK],
157	[dnl	157	[dnl
158	dnl Get the cflags and libraries from the gtk-config script	158	dnl Get the cflags and libraries from the gtk-config script
159	dnl	159	dnl

Lines 102-110 Link Here

(-)feh-1.3.4.original/cam/Makefile.in (-2 / +7 lines)
102	all: all-redirect	102	all: all-redirect
103	.SUFFIXES:	103	.SUFFIXES:
104	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)	104	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
105	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps cam/Makefile	105	cd $(top_srcdir) && $(AUTOMAKE) --foreign cam/Makefile
106		106
107	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	107	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
108	cd $(top_builddir) \	108	cd $(top_builddir) \
109	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status	109	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
110		110
Lines 136-141 Link Here
136	subdir = cam	136	subdir = cam
137		137
138	distdir: $(DISTFILES)	138	distdir: $(DISTFILES)
		139	here=`cd $(top_builddir) && pwd`; \
		140	top_distdir=`cd $(top_distdir) && pwd`; \
		141	distdir=`cd $(distdir) && pwd`; \
		142	cd $(top_srcdir) \
		143	&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign cam/Makefile
139	@for file in $(DISTFILES); do \	144	@for file in $(DISTFILES); do \
140	d=$(srcdir); \	145	d=$(srcdir); \
141	if test -d $$d/$$file; then \	146	if test -d $$d/$$file; then \




  	  /^X\(\/\).*/{ s//\1/; q; }
  	  s/.*/./; q'`
  srcdir=$ac_confdir
  if test ! -r "$srcdir/$ac_unique_file"; then
    srcdir=..
  fi
else
  ac_srcdir_defaulted=no
fi
if test ! -r "$srcdir/$ac_unique_file"; then
  if test "$ac_srcdir_defaulted" = yes; then
    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
   { (exit 1); exit 1; }; }

   { (exit 1); exit 1; }; }
  fi
fi
(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
   { (exit 1); exit 1; }; }
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`

  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  --enable-maintainer-mode enable make rules and dependencies not useful
                          (and sometimes confusing) to the casual installer
  --disable-xinerama      disable Xinerama multi screen support

Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

    else
      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
    fi
    cd $ac_popdir
  done
fi


  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?




# Check whether --enable-xinerama or --disable-xinerama was given.
if test "${enable_xinerama+set}" = set; then
  enableval="$enable_xinerama"
   if test x"$enableval" = xyes; then
    with_xinerama="yes, check"
  else
    with_xinerama="no"
  fi
else
   with_xinerama="not specified, check"

fi;
if test x"$with_xinerama" != xno; then
   CFLAGS="-I/usr/X11R6/include $CFLAGS"
   LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg"

echo "$as_me:$LINENO: checking for XMissingExtension in -lXext" >&5
echo $ECHO_N "checking for XMissingExtension in -lXext... $ECHO_C" >&6

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?




fi

echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

fi



echo "checking for pr0n.... found"

                                                  ac_config_files="$ac_config_files Makefile feh.spec cam/Makefile src/Makefile src/ttfonts/Makefile"

  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
  esac

  if test x"$ac_file" != x-; then
    { echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
    rm -f "$ac_file"
  fi
  # Let's still pretend it is `configure' which instantiates (i.e., don't
  # use $as_me), people would be surprised to read:
  #    /* config.h.  Generated by config.status.  */

	 fi;;
      esac
    done` || { (exit 1); exit 1; }

  if test x"$ac_file" != x-; then
    { echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
    rm -f "$ac_file"
  fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
  sed "$ac_vpsub




AC_SUBST(GIBLIB_CFLAGS)

dnl Check for Xinerama
AC_ARG_ENABLE(xinerama,
  [  --disable-xinerama      disable Xinerama multi screen support],
  [ if test x"$enableval" = xyes; then
    with_xinerama="yes, check"
  else
    with_xinerama="no"
  fi ],
  [ with_xinerama="not specified, check" ]
)
if test x"$with_xinerama" != xno; then
   CFLAGS="-I/usr/X11R6/include $CFLAGS"
   LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg"
   AC_CHECK_LIB(Xext,XMissingExtension,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"])
   AC_CHECK_LIB(Xinerama,XineramaQueryScreens,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"])
   AC_SUBST(HAVE_XINERAMA)
   AC_SUBST(XINERAMA_LIBS)
fi
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress)

dnl AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ="$AC_LIBOBJ getopt.o getopt1.o"])
dnl AC_SUBST(AC_LIBOBJ)






DIST_COMMON =  README AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
TODO acinclude.m4 aclocal.m4 config.guess config.sub configure \
configure.ac configure.in feh.spec.in install-sh missing mkinstalldirs
src/config.h.in src/stamp-h.in


DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile

Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
	cd $(top_builddir) \
	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status


	$(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
	cd $(srcdir) && $(AUTOCONF)

src/config.h: src/stamp-h
	@if test ! -f $@; then \
		rm -f src/stamp-h; \
		$(MAKE) src/stamp-h; \
	else :; fi
src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
	cd $(top_builddir) \
	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
	     $(SHELL) ./config.status
	@echo timestamp > src/stamp-h 2> /dev/null
$(srcdir)/src/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/src/stamp-h.in
	@if test ! -f $@; then \
		rm -f $(srcdir)/src/stamp-h.in; \
		$(MAKE) $(srcdir)/src/stamp-h.in; \
	else :; fi
$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
	cd $(top_srcdir) && $(AUTOHEADER)
	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null

mostlyclean-hdr:

clean-hdr:

distclean-hdr:
	-rm -f src/config.h

maintainer-clean-hdr:
feh.spec: $(top_builddir)/config.status feh.spec.in
	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status


all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive  \
check-recursive installcheck-recursive info-recursive dvi-recursive:
	@set fnord $$MAKEFLAGS; amf=$$2; \
	dot_seen=no; \
	target=`echo $@ | sed s/-recursive//`; \
	list='$(SUBDIRS)'; for subdir in $$list; do \


mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
	@set fnord $$MAKEFLAGS; amf=$$2; \
	dot_seen=no; \
	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
	  rev="$$subdir $$rev"; \

	  awk '    { files[$$0] = 1; } \
	       END { for (i in files) print i; }'`; \
	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)

mostlyclean-tags:


	-rm -rf $(distdir)
	mkdir $(distdir)
	-chmod 777 $(distdir)
	here=`cd $(top_builddir) && pwd`; \
	top_distdir=`cd $(distdir) && pwd`; \
	distdir=`cd $(distdir) && pwd`; \
	cd $(top_srcdir) \
	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
	@for file in $(DISTFILES); do \
	  d=$(srcdir); \
	  if test -d $$d/$$file; then \


maintainer-clean-generic:
	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
mostlyclean-am:  mostlyclean-tags mostlyclean-generic

mostlyclean: mostlyclean-recursive

clean-am:  clean-tags clean-generic mostlyclean-am

clean: clean-recursive

distclean-am:  distclean-tags distclean-generic clean-am

distclean: distclean-recursive
	-rm -f config.status

maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
		distclean-am
	@echo "This command is intended for maintainers to use;"
	@echo "it deletes files that may require special tools to rebuild."

maintainer-clean: maintainer-clean-recursive
	-rm -f config.status

.PHONY: install-man1 uninstall-man1 install-man uninstall-man \
install-man1 uninstall-man1 install-man uninstall-man \
uninstall-docsDATA install-docsDATA install-data-recursive \
uninstall-data-recursive install-exec-recursive \
uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \

Lines 128-133 Link Here

(-)feh-1.3.4.original/src/Makefile.in (-61 / +59 lines)
128		128
129	TAR = tar	129	TAR = tar
130	GZIP_ENV = --best	130	GZIP_ENV = --best
		131	DEP_FILES = .deps/collage.P .deps/events.P .deps/feh_png.P \
		132	.deps/filelist.P .deps/getopt.P .deps/getopt1.P .deps/imlib.P \
		133	.deps/index.P .deps/ipc.P .deps/keyevents.P .deps/list.P .deps/main.P \
		134	.deps/md5.P .deps/menu.P .deps/multiwindow.P .deps/options.P \
		135	.deps/slideshow.P .deps/support.P .deps/thumbnail.P .deps/timers.P \
		136	.deps/transupp.P .deps/utils.P .deps/winwidget.P
131	SOURCES = $(feh_SOURCES)	137	SOURCES = $(feh_SOURCES)
132	OBJECTS = $(feh_OBJECTS)	138	OBJECTS = $(feh_OBJECTS)
133		139
Lines 135-143 Link Here
135	.SUFFIXES:	141	.SUFFIXES:
136	.SUFFIXES: .S .c .o .s	142	.SUFFIXES: .S .c .o .s
137	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)	143	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
138	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile	144	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
139		145
140	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	146	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
141	cd $(top_builddir) \	147	cd $(top_builddir) \
142	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status	148	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
143		149
Lines 195-203 Link Here
195	rm -f $(DESTDIR)$(bindir)/`echo $$p\|sed 's/$(EXEEXT)$$//'\|sed '$(transform)'\|sed 's/$$/$(EXEEXT)/'`; \	201	rm -f $(DESTDIR)$(bindir)/`echo $$p\|sed 's/$(EXEEXT)$$//'\|sed '$(transform)'\|sed 's/$$/$(EXEEXT)/'`; \
196	done	202	done
197		203
198	.c.o:
199	$(COMPILE) -c $<
200
201	.s.o:	204	.s.o:
202	$(COMPILE) -c $<	205	$(COMPILE) -c $<
203		206
Lines 249-255 Link Here
249	all-recursive install-data-recursive install-exec-recursive \	252	all-recursive install-data-recursive install-exec-recursive \
250	installdirs-recursive install-recursive uninstall-recursive \	253	installdirs-recursive install-recursive uninstall-recursive \
251	check-recursive installcheck-recursive info-recursive dvi-recursive:	254	check-recursive installcheck-recursive info-recursive dvi-recursive:
252	@set fnord $(MAKEFLAGS); amf=$$2; \	255	@set fnord $$MAKEFLAGS; amf=$$2; \
253	dot_seen=no; \	256	dot_seen=no; \
254	target=`echo $@ \| sed s/-recursive//`; \	257	target=`echo $@ \| sed s/-recursive//`; \
255	list='$(SUBDIRS)'; for subdir in $$list; do \	258	list='$(SUBDIRS)'; for subdir in $$list; do \
Lines 269-275 Link Here
269		272
270	mostlyclean-recursive clean-recursive distclean-recursive \	273	mostlyclean-recursive clean-recursive distclean-recursive \
271	maintainer-clean-recursive:	274	maintainer-clean-recursive:
272	@set fnord $(MAKEFLAGS); amf=$$2; \	275	@set fnord $$MAKEFLAGS; amf=$$2; \
273	dot_seen=no; \	276	dot_seen=no; \
274	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \	277	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
275	rev="$$subdir $$rev"; \	278	rev="$$subdir $$rev"; \
Lines 315-321 Link Here
315	awk ' { files[$$0] = 1; } \	318	awk ' { files[$$0] = 1; } \
316	END { for (i in files) print i; }'`; \	319	END { for (i in files) print i; }'`; \
317	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \	320	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
318	\|\| (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))	321	\|\| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
319		322
320	mostlyclean-tags:	323	mostlyclean-tags:
321		324
Lines 331-336 Link Here
331	subdir = src	334	subdir = src
332		335
333	distdir: $(DISTFILES)	336	distdir: $(DISTFILES)
		337	here=`cd $(top_builddir) && pwd`; \
		338	top_distdir=`cd $(top_distdir) && pwd`; \
		339	distdir=`cd $(distdir) && pwd`; \
		340	cd $(top_srcdir) \
		341	&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
334	@for file in $(DISTFILES); do \	342	@for file in $(DISTFILES); do \
335	d=$(srcdir); \	343	d=$(srcdir); \
336	if test -d $$d/$$file; then \	344	if test -d $$d/$$file; then \
Lines 351-402 Link Here
351	\|\| exit 1; \	359	\|\| exit 1; \
352	fi; \	360	fi; \
353	done	361	done
354	collage.o: collage.c feh.h config.h getopt.h structs.h menu.h ipc.h \
355	utils.h debug.h winwidget.h filelist.h options.h
356	events.o: events.c feh.h config.h getopt.h structs.h menu.h ipc.h \
357	utils.h debug.h filelist.h winwidget.h timers.h options.h \
358	events.h thumbnail.h
359	feh_png.o: feh_png.c feh_png.h feh.h config.h getopt.h structs.h menu.h \
360	ipc.h utils.h debug.h
361	filelist.o: filelist.c feh.h config.h getopt.h structs.h menu.h ipc.h \
362	utils.h debug.h filelist.h options.h
363	getopt.o: getopt.c config.h
364	getopt1.o: getopt1.c config.h getopt.h
365	imlib.o: imlib.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
366	debug.h filelist.h winwidget.h options.h transupp.h
367	index.o: index.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
368	debug.h filelist.h winwidget.h options.h
369	ipc.o: ipc.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
370	debug.h options.h
371	keyevents.o: keyevents.c feh.h config.h getopt.h structs.h menu.h ipc.h \
372	utils.h debug.h thumbnail.h filelist.h winwidget.h options.h
373	list.o: list.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
374	debug.h filelist.h options.h
375	main.o: main.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
376	debug.h filelist.h winwidget.h timers.h options.h events.h \
377	support.h
378	md5.o: md5.c md5.h
379	menu.o: menu.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
380	debug.h support.h thumbnail.h filelist.h winwidget.h options.h
381	multiwindow.o: multiwindow.c feh.h config.h getopt.h structs.h menu.h \
382	ipc.h utils.h debug.h winwidget.h timers.h filelist.h options.h
383	options.o: options.c feh.h config.h getopt.h structs.h menu.h ipc.h \
384	utils.h debug.h filelist.h options.h
385	slideshow.o: slideshow.c feh.h config.h getopt.h structs.h menu.h ipc.h \
386	utils.h debug.h filelist.h timers.h winwidget.h options.h
387	support.o: support.c feh.h config.h getopt.h structs.h menu.h ipc.h \
388	utils.h debug.h filelist.h options.h support.h
389	thumbnail.o: thumbnail.c feh.h config.h getopt.h structs.h menu.h ipc.h \
390	utils.h debug.h filelist.h winwidget.h options.h thumbnail.h \
391	md5.h feh_png.h
392	timers.o: timers.c feh.h config.h getopt.h structs.h menu.h ipc.h \
393	utils.h debug.h options.h timers.h
394	transupp.o: transupp.c transupp.h
395	utils.o: utils.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
396	debug.h options.h
397	winwidget.o: winwidget.c feh.h config.h getopt.h structs.h menu.h ipc.h \
398	utils.h debug.h filelist.h winwidget.h options.h
399		362
		363	DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 \|\| :)
		364
		365	-include $(DEP_FILES)
		366
		367	mostlyclean-depend:
		368
		369	clean-depend:
		370
		371	distclean-depend:
		372	-rm -rf .deps
		373
		374	maintainer-clean-depend:
		375
		376	%.o: %.c
		377	@echo '$(COMPILE) -c $<'; \
		378	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
		379	@-cp .deps/$(F).pp .deps/$(F).P; \
		380	tr ' ' '\012' < .deps/$(*F).pp \
		381	\| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
		382	>> .deps/$(*F).P; \
		383	rm .deps/$(*F).pp
		384
		385	%.lo: %.c
		386	@echo '$(LTCOMPILE) -c $<'; \
		387	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
		388	@-sed -e 's/^$[^:]$\.o[ ]:/\1.lo \1.o :/' \
		389	< .deps/$(F).pp > .deps/$(F).P; \
		390	tr ' ' '\012' < .deps/$(*F).pp \
		391	\| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
		392	>> .deps/$(*F).P; \
		393	rm -f .deps/$(*F).pp
400	info-am:	394	info-am:
401	info: info-recursive	395	info: info-recursive
402	dvi-am:	396	dvi-am:
Lines 439-462 Link Here
439	maintainer-clean-generic:	433	maintainer-clean-generic:
440	-test -z "$(MAINTAINERCLEANFILES)" \|\| rm -f $(MAINTAINERCLEANFILES)	434	-test -z "$(MAINTAINERCLEANFILES)" \|\| rm -f $(MAINTAINERCLEANFILES)
441	mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \	435	mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
442	mostlyclean-compile mostlyclean-tags \	436	mostlyclean-compile mostlyclean-tags mostlyclean-depend \
443	mostlyclean-generic	437	mostlyclean-generic
444		438
445	mostlyclean: mostlyclean-recursive	439	mostlyclean: mostlyclean-recursive
446		440
447	clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \	441	clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
448	clean-generic mostlyclean-am	442	clean-depend clean-generic mostlyclean-am
449		443
450	clean: clean-recursive	444	clean: clean-recursive
451		445
452	distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \	446	distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \
453	distclean-tags distclean-generic clean-am	447	distclean-tags distclean-depend distclean-generic \
		448	clean-am
454		449
455	distclean: distclean-recursive	450	distclean: distclean-recursive
456		451
457	maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \	452	maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
458	maintainer-clean-compile maintainer-clean-tags \	453	maintainer-clean-compile maintainer-clean-tags \
459	maintainer-clean-generic distclean-am	454	maintainer-clean-depend maintainer-clean-generic \
		455	distclean-am
460	@echo "This command is intended for maintainers to use;"	456	@echo "This command is intended for maintainers to use;"
461	@echo "it deletes files that may require special tools to rebuild."	457	@echo "it deletes files that may require special tools to rebuild."
462		458
Lines 472-481 Link Here
472	all-recursive check-recursive installcheck-recursive info-recursive \	468	all-recursive check-recursive installcheck-recursive info-recursive \
473	dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \	469	dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
474	maintainer-clean-recursive tags tags-recursive mostlyclean-tags \	470	maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
475	distclean-tags clean-tags maintainer-clean-tags distdir info-am info \	471	distclean-tags clean-tags maintainer-clean-tags distdir \
476	dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \	472	mostlyclean-depend distclean-depend clean-depend \
477	install-exec-am install-exec install-data-am install-data install-am \	473	maintainer-clean-depend info-am info dvi-am dvi check check-am \
478	install uninstall-am uninstall all-redirect all-am all installdirs-am \	474	installcheck-am installcheck all-recursive-am install-exec-am \
		475	install-exec install-data-am install-data install-am install \
		476	uninstall-am uninstall all-redirect all-am all installdirs-am \
479	installdirs mostlyclean-generic distclean-generic clean-generic \	477	installdirs mostlyclean-generic distclean-generic clean-generic \
480	maintainer-clean-generic clean mostlyclean distclean maintainer-clean	478	maintainer-clean-generic clean mostlyclean distclean maintainer-clean
481		479

Lines 104-112 Link Here

(-)feh-1.3.4.original/src/ttfonts/Makefile.in (-2 / +7 lines)
104	all: all-redirect	104	all: all-redirect
105	.SUFFIXES:	105	.SUFFIXES:
106	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)	106	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
107	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/ttfonts/Makefile	107	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/ttfonts/Makefile
108		108
109	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	109	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
110	cd $(top_builddir) \	110	cd $(top_builddir) \
111	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status	111	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
112		112
Lines 138-143 Link Here
138	subdir = src/ttfonts	138	subdir = src/ttfonts
139		139
140	distdir: $(DISTFILES)	140	distdir: $(DISTFILES)
		141	here=`cd $(top_builddir) && pwd`; \
		142	top_distdir=`cd $(top_distdir) && pwd`; \
		143	distdir=`cd $(distdir) && pwd`; \
		144	cd $(top_srcdir) \
		145	&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/ttfonts/Makefile
141	@for file in $(DISTFILES); do \	146	@for file in $(DISTFILES); do \
142	d=$(srcdir); \	147	d=$(srcdir); \
143	if test -d $$d/$$file; then \	148	if test -d $$d/$$file; then \

Return to bug 139594

Lines 682-694 Link Here

(-)feh-1.3.4.original/configure (-24 / +48 lines)
682	/^X\(\/\).*/{ s//\1/; q; }	682	/^X\(\/\).*/{ s//\1/; q; }
683	s/.*/./; q'`	683	s/.*/./; q'`
684	srcdir=$ac_confdir	684	srcdir=$ac_confdir
685	if test ! -r $srcdir/$ac_unique_file; then	685	if test ! -r "$srcdir/$ac_unique_file"; then
686	srcdir=..	686	srcdir=..
687	fi	687	fi
688	else	688	else
689	ac_srcdir_defaulted=no	689	ac_srcdir_defaulted=no
690	fi	690	fi
691	if test ! -r $srcdir/$ac_unique_file; then	691	if test ! -r "$srcdir/$ac_unique_file"; then
692	if test "$ac_srcdir_defaulted" = yes; then	692	if test "$ac_srcdir_defaulted" = yes; then
693	{ echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2	693	{ echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
694	{ (exit 1); exit 1; }; }	694	{ (exit 1); exit 1; }; }
Lines 697-703 Link Here
697	{ (exit 1); exit 1; }; }	697	{ (exit 1); exit 1; }; }
698	fi	698	fi
699	fi	699	fi
700	(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null \|\|	700	(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null \|\|
701	{ echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2	701	{ echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
702	{ (exit 1); exit 1; }; }	702	{ (exit 1); exit 1; }; }
703	srcdir=`echo "$srcdir" \| sed 's%\([^\\/]\)[\\/]*$%\1%'`	703	srcdir=`echo "$srcdir" \| sed 's%\([^\\/]\)[\\/]*$%\1%'`
Lines 806-811 Link Here
806	--enable-FEATURE[=ARG] include FEATURE [ARG=yes]	806	--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
807	--enable-maintainer-mode enable make rules and dependencies not useful	807	--enable-maintainer-mode enable make rules and dependencies not useful
808	(and sometimes confusing) to the casual installer	808	(and sometimes confusing) to the casual installer
		809	--disable-xinerama disable Xinerama multi screen support
809		810
810	Optional Packages:	811	Optional Packages:
811	--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]	812	--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
Lines 917-923 Link Here
917	else	918	else
918	echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2	919	echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
919	fi	920	fi
920	cd "$ac_popdir"	921	cd $ac_popdir
921	done	922	done
922	fi	923	fi
923		924
Lines 2130-2136 Link Here
2130	cat conftest.err >&5	2131	cat conftest.err >&5
2131	echo "$as_me:$LINENO: \$? = $ac_status" >&5	2132	echo "$as_me:$LINENO: \$? = $ac_status" >&5
2132	(exit $ac_status); } &&	2133	(exit $ac_status); } &&
2133	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	2134	{ ac_try='test -z "$ac_c_werror_flag"
		2135	\|\| test ! -s conftest.err'
2134	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	2136	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2135	(eval $ac_try) 2>&5	2137	(eval $ac_try) 2>&5
2136	ac_status=$?	2138	ac_status=$?
Lines 2188-2194 Link Here
2188	cat conftest.err >&5	2190	cat conftest.err >&5
2189	echo "$as_me:$LINENO: \$? = $ac_status" >&5	2191	echo "$as_me:$LINENO: \$? = $ac_status" >&5
2190	(exit $ac_status); } &&	2192	(exit $ac_status); } &&
2191	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	2193	{ ac_try='test -z "$ac_c_werror_flag"
		2194	\|\| test ! -s conftest.err'
2192	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	2195	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2193	(eval $ac_try) 2>&5	2196	(eval $ac_try) 2>&5
2194	ac_status=$?	2197	ac_status=$?
Lines 2304-2310 Link Here
2304	cat conftest.err >&5	2307	cat conftest.err >&5
2305	echo "$as_me:$LINENO: \$? = $ac_status" >&5	2308	echo "$as_me:$LINENO: \$? = $ac_status" >&5
2306	(exit $ac_status); } &&	2309	(exit $ac_status); } &&
2307	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	2310	{ ac_try='test -z "$ac_c_werror_flag"
		2311	\|\| test ! -s conftest.err'
2308	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	2312	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2309	(eval $ac_try) 2>&5	2313	(eval $ac_try) 2>&5
2310	ac_status=$?	2314	ac_status=$?
Lines 2358-2364 Link Here
2358	cat conftest.err >&5	2362	cat conftest.err >&5
2359	echo "$as_me:$LINENO: \$? = $ac_status" >&5	2363	echo "$as_me:$LINENO: \$? = $ac_status" >&5
2360	(exit $ac_status); } &&	2364	(exit $ac_status); } &&
2361	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	2365	{ ac_try='test -z "$ac_c_werror_flag"
		2366	\|\| test ! -s conftest.err'
2362	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	2367	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2363	(eval $ac_try) 2>&5	2368	(eval $ac_try) 2>&5
2364	ac_status=$?	2369	ac_status=$?
Lines 2403-2409 Link Here
2403	cat conftest.err >&5	2408	cat conftest.err >&5
2404	echo "$as_me:$LINENO: \$? = $ac_status" >&5	2409	echo "$as_me:$LINENO: \$? = $ac_status" >&5
2405	(exit $ac_status); } &&	2410	(exit $ac_status); } &&
2406	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	2411	{ ac_try='test -z "$ac_c_werror_flag"
		2412	\|\| test ! -s conftest.err'
2407	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	2413	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2408	(eval $ac_try) 2>&5	2414	(eval $ac_try) 2>&5
2409	ac_status=$?	2415	ac_status=$?
Lines 2447-2453 Link Here
2447	cat conftest.err >&5	2453	cat conftest.err >&5
2448	echo "$as_me:$LINENO: \$? = $ac_status" >&5	2454	echo "$as_me:$LINENO: \$? = $ac_status" >&5
2449	(exit $ac_status); } &&	2455	(exit $ac_status); } &&
2450	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	2456	{ ac_try='test -z "$ac_c_werror_flag"
		2457	\|\| test ! -s conftest.err'
2451	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	2458	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2452	(eval $ac_try) 2>&5	2459	(eval $ac_try) 2>&5
2453	ac_status=$?	2460	ac_status=$?
Lines 2560-2566 Link Here
2560	cat conftest.err >&5	2567	cat conftest.err >&5
2561	echo "$as_me:$LINENO: \$? = $ac_status" >&5	2568	echo "$as_me:$LINENO: \$? = $ac_status" >&5
2562	(exit $ac_status); } &&	2569	(exit $ac_status); } &&
2563	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	2570	{ ac_try='test -z "$ac_c_werror_flag"
		2571	\|\| test ! -s conftest.err'
2564	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	2572	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2565	(eval $ac_try) 2>&5	2573	(eval $ac_try) 2>&5
2566	ac_status=$?	2574	ac_status=$?
Lines 2671-2677 Link Here
2671	cat conftest.err >&5	2679	cat conftest.err >&5
2672	echo "$as_me:$LINENO: \$? = $ac_status" >&5	2680	echo "$as_me:$LINENO: \$? = $ac_status" >&5
2673	(exit $ac_status); } &&	2681	(exit $ac_status); } &&
2674	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	2682	{ ac_try='test -z "$ac_c_werror_flag"
		2683	\|\| test ! -s conftest.err'
2675	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	2684	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2676	(eval $ac_try) 2>&5	2685	(eval $ac_try) 2>&5
2677	ac_status=$?	2686	ac_status=$?
Lines 3190-3197 Link Here
3190		3199
3191		3200
3192		3201
3193	CFLAGS="-I/usr/X11R6/include $CFLAGS"	3202	# Check whether --enable-xinerama or --disable-xinerama was given.
3194	LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg"	3203	if test "${enable_xinerama+set}" = set; then
		3204	enableval="$enable_xinerama"
		3205	if test x"$enableval" = xyes; then
		3206	with_xinerama="yes, check"
		3207	else
		3208	with_xinerama="no"
		3209	fi
		3210	else
		3211	with_xinerama="not specified, check"
		3212
		3213	fi;
		3214	if test x"$with_xinerama" != xno; then
		3215	CFLAGS="-I/usr/X11R6/include $CFLAGS"
		3216	LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg"
3195		3217
3196	echo "$as_me:$LINENO: checking for XMissingExtension in -lXext" >&5	3218	echo "$as_me:$LINENO: checking for XMissingExtension in -lXext" >&5
3197	echo $ECHO_N "checking for XMissingExtension in -lXext... $ECHO_C" >&6	3219	echo $ECHO_N "checking for XMissingExtension in -lXext... $ECHO_C" >&6
Lines 3231-3237 Link Here
3231	cat conftest.err >&5	3253	cat conftest.err >&5
3232	echo "$as_me:$LINENO: \$? = $ac_status" >&5	3254	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3233	(exit $ac_status); } &&	3255	(exit $ac_status); } &&
3234	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	3256	{ ac_try='test -z "$ac_c_werror_flag"
		3257	\|\| test ! -s conftest.err'
3235	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	3258	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3236	(eval $ac_try) 2>&5	3259	(eval $ac_try) 2>&5
3237	ac_status=$?	3260	ac_status=$?
Lines 3306-3312 Link Here
3306	cat conftest.err >&5	3329	cat conftest.err >&5
3307	echo "$as_me:$LINENO: \$? = $ac_status" >&5	3330	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3308	(exit $ac_status); } &&	3331	(exit $ac_status); } &&
3309	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	3332	{ ac_try='test -z "$ac_c_werror_flag"
		3333	\|\| test ! -s conftest.err'
3310	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	3334	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3311	(eval $ac_try) 2>&5	3335	(eval $ac_try) 2>&5
3312	ac_status=$?	3336	ac_status=$?
Lines 3344-3349 Link Here
3344		3368
3345		3369
3346		3370
		3371	fi
3347		3372
3348	echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5	3373	echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
3349	echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6	3374	echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6
Lines 3383-3389 Link Here
3383	cat conftest.err >&5	3408	cat conftest.err >&5
3384	echo "$as_me:$LINENO: \$? = $ac_status" >&5	3409	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3385	(exit $ac_status); } &&	3410	(exit $ac_status); } &&
3386	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'	3411	{ ac_try='test -z "$ac_c_werror_flag"
		3412	\|\| test ! -s conftest.err'
3387	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	3413	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3388	(eval $ac_try) 2>&5	3414	(eval $ac_try) 2>&5
3389	ac_status=$?	3415	ac_status=$?
Lines 3418-3424 Link Here
3418	fi	3444	fi
3419		3445
3420		3446
3421
3422	echo "checking for pr0n.... found"	3447	echo "checking for pr0n.... found"
3423		3448
3424	ac_config_files="$ac_config_files Makefile feh.spec cam/Makefile src/Makefile src/ttfonts/Makefile"	3449	ac_config_files="$ac_config_files Makefile feh.spec cam/Makefile src/Makefile src/ttfonts/Makefile"
Lines 4249-4254 Link Here
4249	*) ac_INSTALL=$ac_top_builddir$INSTALL ;;	4274	*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
4250	esac	4275	esac
4251		4276
		4277	if test x"$ac_file" != x-; then
		4278	{ echo "$as_me:$LINENO: creating $ac_file" >&5
		4279	echo "$as_me: creating $ac_file" >&6;}
		4280	rm -f "$ac_file"
		4281	fi
4252	# Let's still pretend it is `configure' which instantiates (i.e., don't	4282	# Let's still pretend it is `configure' which instantiates (i.e., don't
4253	# use $as_me), people would be surprised to read:	4283	# use $as_me), people would be surprised to read:
4254	# /* config.h. Generated by config.status. */	4284	# /* config.h. Generated by config.status. */
Lines 4287-4298 Link Here
4287	fi;;	4317	fi;;
4288	esac	4318	esac
4289	done` \|\| { (exit 1); exit 1; }	4319	done` \|\| { (exit 1); exit 1; }
4290
4291	if test x"$ac_file" != x-; then
4292	{ echo "$as_me:$LINENO: creating $ac_file" >&5
4293	echo "$as_me: creating $ac_file" >&6;}
4294	rm -f "$ac_file"
4295	fi
4296	_ACEOF	4320	_ACEOF
4297	cat >>$CONFIG_STATUS <<_ACEOF	4321	cat >>$CONFIG_STATUS <<_ACEOF
4298	sed "$ac_vpsub	4322	sed "$ac_vpsub

Lines 41-54 Link Here

(-)feh-1.3.4.original/configure.ac (-7 / +17 lines)
41	AC_SUBST(GIBLIB_CFLAGS)	41	AC_SUBST(GIBLIB_CFLAGS)
42		42
43	dnl Check for Xinerama	43	dnl Check for Xinerama
44	CFLAGS="-I/usr/X11R6/include $CFLAGS"	44	AC_ARG_ENABLE(xinerama,
45	LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg"	45	[ --disable-xinerama disable Xinerama multi screen support],
46	AC_CHECK_LIB(Xext,XMissingExtension,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"])	46	[ if test x"$enableval" = xyes; then
47	AC_CHECK_LIB(Xinerama,XineramaQueryScreens,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"])	47	with_xinerama="yes, check"
48	AC_SUBST(HAVE_XINERAMA)	48	else
49	AC_SUBST(XINERAMA_LIBS)	49	with_xinerama="no"
		50	fi ],
		51	[ with_xinerama="not specified, check" ]
		52	)
		53	if test x"$with_xinerama" != xno; then
		54	CFLAGS="-I/usr/X11R6/include $CFLAGS"
		55	LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg"
		56	AC_CHECK_LIB(Xext,XMissingExtension,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"])
		57	AC_CHECK_LIB(Xinerama,XineramaQueryScreens,, [CFLAGS="$CFLAGS -I/usr/X11R6/include"])
		58	AC_SUBST(HAVE_XINERAMA)
		59	AC_SUBST(XINERAMA_LIBS)
		60	fi
50	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress)	61	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress)
51
52	dnl AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ="$AC_LIBOBJ getopt.o getopt1.o"])	62	dnl AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ="$AC_LIBOBJ getopt.o getopt1.o"])
53	dnl AC_SUBST(AC_LIBOBJ)	63	dnl AC_SUBST(AC_LIBOBJ)
54		64

Lines 108-115 Link Here

(-)feh-1.3.4.original/Makefile.in (-42 / +17 lines)
108		108
109	DIST_COMMON = README AUTHORS COPYING ChangeLog Makefile.am Makefile.in \	109	DIST_COMMON = README AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
110	TODO acinclude.m4 aclocal.m4 config.guess config.sub configure \	110	TODO acinclude.m4 aclocal.m4 config.guess config.sub configure \
111	configure.ac configure.in feh.spec.in install-sh missing mkinstalldirs \	111	configure.ac configure.in feh.spec.in install-sh missing mkinstalldirs
112	src/config.h.in src/stamp-h.in
113		112
114		113
115	DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)	114	DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
Lines 119-127 Link Here
119	all: all-redirect	118	all: all-redirect
120	.SUFFIXES:	119	.SUFFIXES:
121	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)	120	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
122	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile	121	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
123		122
124	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	123	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
125	cd $(top_builddir) \	124	cd $(top_builddir) \
126	&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status	125	&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
127		126
Lines 132-165 Link Here
132	$(SHELL) ./config.status --recheck	131	$(SHELL) ./config.status --recheck
133	$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)	132	$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
134	cd $(srcdir) && $(AUTOCONF)	133	cd $(srcdir) && $(AUTOCONF)
135
136	src/config.h: src/stamp-h
137	@if test ! -f $@; then \
138	rm -f src/stamp-h; \
139	$(MAKE) src/stamp-h; \
140	else :; fi
141	src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
142	cd $(top_builddir) \
143	&& CONFIG_FILES= CONFIG_HEADERS=src/config.h \
144	$(SHELL) ./config.status
145	@echo timestamp > src/stamp-h 2> /dev/null
146	$(srcdir)/src/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/src/stamp-h.in
147	@if test ! -f $@; then \
148	rm -f $(srcdir)/src/stamp-h.in; \
149	$(MAKE) $(srcdir)/src/stamp-h.in; \
150	else :; fi
151	$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
152	cd $(top_srcdir) && $(AUTOHEADER)
153	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
154
155	mostlyclean-hdr:
156
157	clean-hdr:
158
159	distclean-hdr:
160	-rm -f src/config.h
161
162	maintainer-clean-hdr:
163	feh.spec: $(top_builddir)/config.status feh.spec.in	134	feh.spec: $(top_builddir)/config.status feh.spec.in
164	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status	135	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
165		136
Lines 233-239 Link Here
233	all-recursive install-data-recursive install-exec-recursive \	204	all-recursive install-data-recursive install-exec-recursive \
234	installdirs-recursive install-recursive uninstall-recursive \	205	installdirs-recursive install-recursive uninstall-recursive \
235	check-recursive installcheck-recursive info-recursive dvi-recursive:	206	check-recursive installcheck-recursive info-recursive dvi-recursive:
236	@set fnord $(MAKEFLAGS); amf=$$2; \	207	@set fnord $$MAKEFLAGS; amf=$$2; \
237	dot_seen=no; \	208	dot_seen=no; \
238	target=`echo $@ \| sed s/-recursive//`; \	209	target=`echo $@ \| sed s/-recursive//`; \
239	list='$(SUBDIRS)'; for subdir in $$list; do \	210	list='$(SUBDIRS)'; for subdir in $$list; do \
Lines 253-259 Link Here
253		224
254	mostlyclean-recursive clean-recursive distclean-recursive \	225	mostlyclean-recursive clean-recursive distclean-recursive \
255	maintainer-clean-recursive:	226	maintainer-clean-recursive:
256	@set fnord $(MAKEFLAGS); amf=$$2; \	227	@set fnord $$MAKEFLAGS; amf=$$2; \
257	dot_seen=no; \	228	dot_seen=no; \
258	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \	229	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
259	rev="$$subdir $$rev"; \	230	rev="$$subdir $$rev"; \
Lines 299-305 Link Here
299	awk ' { files[$$0] = 1; } \	270	awk ' { files[$$0] = 1; } \
300	END { for (i in files) print i; }'`; \	271	END { for (i in files) print i; }'`; \
301	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \	272	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
302	\|\| (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))	273	\|\| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
303		274
304	mostlyclean-tags:	275	mostlyclean-tags:
305		276
Lines 348-353 Link Here
348	-rm -rf $(distdir)	319	-rm -rf $(distdir)
349	mkdir $(distdir)	320	mkdir $(distdir)
350	-chmod 777 $(distdir)	321	-chmod 777 $(distdir)
		322	here=`cd $(top_builddir) && pwd`; \
		323	top_distdir=`cd $(distdir) && pwd`; \
		324	distdir=`cd $(distdir) && pwd`; \
		325	cd $(top_srcdir) \
		326	&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
351	@for file in $(DISTFILES); do \	327	@for file in $(DISTFILES); do \
352	d=$(srcdir); \	328	d=$(srcdir); \
353	if test -d $$d/$$file; then \	329	if test -d $$d/$$file; then \
Lines 406-434 Link Here
406		382
407	maintainer-clean-generic:	383	maintainer-clean-generic:
408	-test -z "$(MAINTAINERCLEANFILES)" \|\| rm -f $(MAINTAINERCLEANFILES)	384	-test -z "$(MAINTAINERCLEANFILES)" \|\| rm -f $(MAINTAINERCLEANFILES)
409	mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic	385	mostlyclean-am: mostlyclean-tags mostlyclean-generic
410		386
411	mostlyclean: mostlyclean-recursive	387	mostlyclean: mostlyclean-recursive
412		388
413	clean-am: clean-hdr clean-tags clean-generic mostlyclean-am	389	clean-am: clean-tags clean-generic mostlyclean-am
414		390
415	clean: clean-recursive	391	clean: clean-recursive
416		392
417	distclean-am: distclean-hdr distclean-tags distclean-generic clean-am	393	distclean-am: distclean-tags distclean-generic clean-am
418		394
419	distclean: distclean-recursive	395	distclean: distclean-recursive
420	-rm -f config.status	396	-rm -f config.status
421		397
422	maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \	398	maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
423	maintainer-clean-generic distclean-am	399	distclean-am
424	@echo "This command is intended for maintainers to use;"	400	@echo "This command is intended for maintainers to use;"
425	@echo "it deletes files that may require special tools to rebuild."	401	@echo "it deletes files that may require special tools to rebuild."
426		402
427	maintainer-clean: maintainer-clean-recursive	403	maintainer-clean: maintainer-clean-recursive
428	-rm -f config.status	404	-rm -f config.status
429		405
430	.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \	406	.PHONY: install-man1 uninstall-man1 install-man uninstall-man \
431	install-man1 uninstall-man1 install-man uninstall-man \
432	uninstall-docsDATA install-docsDATA install-data-recursive \	407	uninstall-docsDATA install-docsDATA install-data-recursive \
433	uninstall-data-recursive install-exec-recursive \	408	uninstall-data-recursive install-exec-recursive \
434	uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \	409	uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \