summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2010-08-06 08:54:56 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-08-06 08:54:56 -0700
commit71b679ff4a6680368f3da23b184e081fdf4bedfd (patch)
treea6743e4a82d066c19f7b482c5a6d3922610d2f49
parent8d5842d32d880fab4e076776b669b6cd3d07a8ca (diff)
Use AM_CFLAGS instead of requiring AM_PROG_CC_C_O
Since we don't build different targets with different CFLAGS, simplify configuration and build. Also remove AC_PROG_CC since XORG_DEFAULT_OPTIONS handles that now. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 6a2d928..bf80d65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xditview
-xditview_CFLAGS = $(XDITVIEW_CFLAGS)
+AM_CFLAGS = $(XDITVIEW_CFLAGS)
xditview_LDADD = $(XDITVIEW_LIBS) -lm
xditview_SOURCES = \
diff --git a/configure.ac b/configure.ac
index cff2d4a..650481a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,11 +34,8 @@ XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
-AM_PROG_CC_C_O
AC_PROG_INSTALL
-
AC_CHECK_FUNC([mkstemp],
AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.]))