From 031cf5e8ffd0511c1d69a41da295ab6bb017bc1d Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sun, 21 Mar 2010 16:57:12 +0100 Subject: Remove autoconf (from branch 'autocruft') Use config.mk for configuration, both GNU make and FreeBSD make are supported. --- configure.ac | 67 ------------------------------------------------------------ 1 file changed, 67 deletions(-) delete mode 100644 configure.ac (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 9e14757..0000000 --- a/configure.ac +++ /dev/null @@ -1,67 +0,0 @@ -dnl Process this file with autoconf to create configure. - -AC_INIT -AC_CONFIG_SRCDIR([src/main.c]) -AM_INIT_AUTOMAKE(feh, 1.4.1) -AM_CONFIG_HEADER(src/config.h) - -AC_PROG_CC -AM_PROG_CC_STDC -AC_C_CONST - -AC_PROG_INSTALL -AC_PROG_MAKE_SET - -AM_MAINTAINER_MODE -AM_WITH_DMALLOC - -AC_ARG_WITH(imlib2, - [ --with-imlib2=DIR use imlib2 in ], - [CFLAGS="$CFLAGS -I$withval/include" - LIBS="-L$withval/lib $LIBS"]) - -AC_PATH_GENERIC(imlib2, 1.0.0, [ - AC_SUBST(IMLIB_LIBS) - AC_SUBST(IMLIB_CFLAGS) ], - AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ) -IMLIB_LIBS=`imlib2-config --libs` -IMLIB_CFLAGS=`imlib2-config --cflags` -AC_SUBST(IMLIB_LIBS) -AC_SUBST(IMLIB_CFLAGS) - -AC_PATH_GENERIC(giblib, 1.2.4, [ - AC_SUBST(GIBLIB_LIBS) - AC_SUBST(GIBLIB_CFLAGS) ], - AC_MSG_ERROR(Cannot find giblib: Is giblib-config in the path?) ) - -dnl the above doesn't work for some reason :/ -GIBLIB_LIBS=`giblib-config --libs` -GIBLIB_CFLAGS=`giblib-config --cflags` -AC_SUBST(GIBLIB_LIBS) -AC_SUBST(GIBLIB_CFLAGS) - -dnl Check for Xinerama -CFLAGS="-I/usr/X11R6/include $CFLAGS" -LIBS="-L/usr/X11R6/lib $LIBS -lm" -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) - -dnl AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ="$AC_LIBOBJ getopt.o getopt1.o"]) -dnl AC_SUBST(AC_LIBOBJ) - -echo "checking for pr0n.... found" - -AC_CONFIG_FILES([Makefile \ -feh.spec \ -cam/Makefile \ -src/Makefile \ -src/ttfonts/Makefile \ -]) -AC_OUTPUT - -echo "" -echo "If you have used an earlier version of feh," -echo "please remove your ~/.fehrc config file." -echo "feh will create a new one when it is first run." -- cgit v1.2.3