configure.ac: cleanup

diff --git a/configure.ac b/configure.ac
index 78c0251..49dd4f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,26 @@
-AC_PREREQ(2.59)
-AC_INIT([libsmack],[1.0.0pre20110819])
+AC_PREREQ(2.60)
+AC_INIT([libsmack],
+       [1],
+       [jarkko.sakkinen@intel.com],
+       [libsmack],
+       [https://meego.gitorious.org/meego-platform-security/libsmack])
+AC_CONFIG_SRCDIR([src/libsmack.c])
+AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign])
-
+AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_MACRO_DIR([m4])
+AM_SILENT_RULES([yes])
+LT_INIT([disable-static])
+AC_PREFIX_DEFAULT([/usr])
 
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AC_PROG_MAKE_SET
-
-LT_INIT
-
-# Doxygen
 AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen], [])
-AC_MSG_CHECKING([wheter to add documentation targets])
+AC_MSG_CHECKING([for doxygen])
 if test ! -z "$DOXYGEN"; then
        AC_MSG_RESULT([yes])
 else
        AC_MSG_RESULT([no])
 fi
-AM_CONDITIONAL([HAVE_DOXYGEN],[test ! -z "$DOXYGEN"])
+AM_CONDITIONAL([ENABLE_DOXYGEN],[test ! -z "$DOXYGEN"], [Build API documentation.])
 AC_SUBST([DOXYGEN], [$DOXYGEN])
 
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile libsmack.pc])

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9e4f810..cfb0736 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST=Doxyfile
 
-if HAVE_DOXYGEN
+if ENABLE_DOXYGEN
 
 docpkg = $(PACKAGE_TARNAME)-doxygen-$(PACKAGE_VERSION).tar.gz
 
@@ -12,7 +12,7 @@ $(docpkg): doxygen.stamp
        tar chof - html | gzip -9 -c >$@
 
 doxygen.stamp: Doxyfile
-       $(DOXYGEN) $(DOXYFLAGS) $<
+       $(DOXYGEN)  $<
        echo Timestamp > $@
 
 clean-local:

diff --git a/src/libsmack.h b/src/libsmack.h
index 54a4ad7..3bba474 100644 (file)
--- a/src/libsmack.h
+++ b/src/libsmack.h
@@ -92,9 +92,8 @@ extern int smack_rule_set_add(SmackRuleSet handle, const char *subject,
                              const char *object, const char *access_type);
 
 /*!
- * Check Smack access.
+ * Check for Smack access.
  *
- * @param fd file descriptor
  * @param subject subject of the rule
  * @param object object of the rule
  * @param access_type access type

diff --git a/tests/smackctl.c b/tests/smackctl.c
index 948a570..5fa7023 100644 (file)
--- a/tests/smackctl.c
+++ b/tests/smackctl.c
@@ -21,9 +21,6 @@
  * Jarkko Sakkinen <jarkko.sakkinen@intel.com>
  */
 
-#define __USE_XOPEN_EXTENDED 1
-#define _GNU_SOURCE 1
-#define __USE_GNU 1
 #include <ftw.h>
 #include <stdio.h>
 #include <stdlib.h>