Permalink
Browse files

Cleaned up a bit of autotools

  • Loading branch information...
1 parent 8a776a0 commit b2f79f187ba5bf70f62061876291ee97cc8c563a @ThomasHabets committed Dec 22, 2011
Showing with 16 additions and 16 deletions.
  1. +0 −3 Makefile.am.common
  2. +16 −13 configure.ac
View
@@ -1,9 +1,6 @@
# -*- Autoconf -*-
# monotonic_clock/Makefile.am.common
-# Don't complain about "missing" standard GNU files
-AUTOMAKE_OPTIONS = foreign
-
CCFLAGS=-I$(top_srcdir)
DISTCLEANFILES = *~
View
@@ -3,9 +3,9 @@
#
AC_PREREQ(2.61)
-AC_INIT([monotonic_clock], [0.01], [thomas@habets.pp.se])
+AC_INIT([monotonic_clock], [0.01], [thomas@habets.se])
AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign silent-rules subdir-objects])
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([src/monotonic_clock.c])
AC_CONFIG_HEADER(config.h)
@@ -34,17 +34,20 @@ AC_TYPE_UINT32_T
EL_CLOCK_MONOTONIC
-if test x$ac_cv_have_clock_monotonic = xyes; then
- portability=getclock
-elif test x$ac_cv_func_mach_absolute_time = xyes; then
- portability=mach
-else
- portability=generic
-fi
-
-AM_CONDITIONAL([SRC_MONOTONIC_CLOCK], [test x$portability = xgetclock ])
-AM_CONDITIONAL([SRC_MONOTONIC_MACH], [test x$portability = xmach ])
-AM_CONDITIONAL([SRC_MONOTONIC_GENERIC], [test x$portability = xgeneic ])
+AS_IF(
+ [test x$ac_cv_have_clock_monotonic = xyes],
+ [portability=getclock],
+
+ [test x$ac_cv_func_mach_absolute_time = xyes],
+ [portability=mach],
+
+ [portability=generic]
+)
+
+# AS_CASE([$portability],
+AM_CONDITIONAL([SRC_MONOTONIC_CLOCK], [test x$portability = xgetclock])
+AM_CONDITIONAL([SRC_MONOTONIC_MACH], [test x$portability = xmach])
+AM_CONDITIONAL([SRC_MONOTONIC_GENERIC], [test x$portability = xgeneric])
AC_SUBST([SRC_MONOTONIC_CLOCK])
AC_SUBST([SRC_MONOTONIC_MACH])

0 comments on commit b2f79f1

Please sign in to comment.