diff options
author | Sumit Bose <sbose@redhat.com> | 2009-05-22 10:08:06 +0200 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2009-05-26 08:52:25 -0400 |
commit | b55cd4c68b7ef6c7364b9c8ac2c5b644303c1120 (patch) | |
tree | 1c95bdee11e2ca9721a2f356d95dab68fed31016 /replace | |
parent | 3624d766f6098b998a6b60f89285f18faaf8dc61 (diff) | |
download | sssd-b55cd4c68b7ef6c7364b9c8ac2c5b644303c1120.tar.gz sssd-b55cd4c68b7ef6c7364b9c8ac2c5b644303c1120.tar.bz2 sssd-b55cd4c68b7ef6c7364b9c8ac2c5b644303c1120.zip |
more autotools cleanup
Diffstat (limited to 'replace')
-rw-r--r-- | replace/build_macros.m4 | 2 | ||||
-rw-r--r-- | replace/configure.ac | 3 | ||||
-rw-r--r-- | replace/libreplace.m4 | 8 | ||||
-rw-r--r-- | replace/libreplace_cc.m4 | 4 | ||||
-rw-r--r-- | replace/libreplace_macros.m4 | 8 | ||||
-rw-r--r-- | replace/libreplace_network.m4 | 2 |
6 files changed, 14 insertions, 13 deletions
diff --git a/replace/build_macros.m4 b/replace/build_macros.m4 index c036668c..9ee4cc87 100644 --- a/replace/build_macros.m4 +++ b/replace/build_macros.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(BUILD_WITH_SHARED_BUILD_DIR, +AC_DEFUN([BUILD_WITH_SHARED_BUILD_DIR], [ AC_ARG_WITH([shared-build-dir], [AC_HELP_STRING([--with-shared-build-dir=DIR], [temporary build directory where libraries are installed [$srcdir/sharedbuild]])]) diff --git a/replace/configure.ac b/replace/configure.ac index c90e2a43..b9236813 100644 --- a/replace/configure.ac +++ b/replace/configure.ac @@ -3,13 +3,14 @@ AC_INIT([libreplace], [0.0]) AC_CONFIG_SRCDIR([replace.c]) AC_CONFIG_HEADER(config.h) AC_CONFIG_AUX_DIR([build]) -AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) AC_PROG_RANLIB CFLAGS="$CFLAGS -I$srcdir" AC_LIBREPLACE_ALL_CHECKS AC_LIBREPLACE_NETWORK_CHECKS +AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) + if test "$ac_cv_prog_gcc" = yes; then CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -W" diff --git a/replace/libreplace.m4 b/replace/libreplace.m4 index e563acfd..adc883bc 100644 --- a/replace/libreplace.m4 +++ b/replace/libreplace.m4 @@ -1,4 +1,4 @@ -AC_DEFUN_ONCE(AC_LIBREPLACE_LOCATION_CHECKS, +AC_DEFUN_ONCE([AC_LIBREPLACE_LOCATION_CHECKS], [ echo "LIBREPLACE_LOCATION_CHECKS: START" @@ -27,7 +27,7 @@ echo "LIBREPLACE_LOCATION_CHECKS: END" ]) dnl end AC_LIBREPLACE_LOCATION_CHECKS -AC_DEFUN_ONCE(AC_LIBREPLACE_BROKEN_CHECKS, +AC_DEFUN_ONCE([AC_LIBREPLACE_BROKEN_CHECKS], [ echo "LIBREPLACE_BROKEN_CHECKS: START" @@ -282,11 +282,11 @@ AC_CHECK_FUNCS([syslog printf memset memcpy],,[AC_MSG_ERROR([Required function n echo "LIBREPLACE_BROKEN_CHECKS: END" ]) dnl end AC_LIBREPLACE_BROKEN_CHECKS -AC_DEFUN_ONCE(AC__LIBREPLACE_ALL_CHECKS_START, +AC_DEFUN_ONCE([AC__LIBREPLACE_ALL_CHECKS_START], [ #LIBREPLACE_ALL_CHECKS: START" ]) -AC_DEFUN_ONCE(AC__LIBREPLACE_ALL_CHECKS_END, +AC_DEFUN_ONCE([AC__LIBREPLACE_ALL_CHECKS_END], [ #LIBREPLACE_ALL_CHECKS: END" ]) diff --git a/replace/libreplace_cc.m4 b/replace/libreplace_cc.m4 index 30c63f2f..cb15a68f 100644 --- a/replace/libreplace_cc.m4 +++ b/replace/libreplace_cc.m4 @@ -1,10 +1,10 @@ -AC_DEFUN_ONCE(AC__LIBREPLACE_ONLY_CC_CHECKS_START, +AC_DEFUN_ONCE([AC__LIBREPLACE_ONLY_CC_CHECKS_START], [ echo "LIBREPLACE_CC_CHECKS: START" ]) -AC_DEFUN_ONCE(AC__LIBREPLACE_ONLY_CC_CHECKS_END, +AC_DEFUN_ONCE([AC__LIBREPLACE_ONLY_CC_CHECKS_END], [ echo "LIBREPLACE_CC_CHECKS: END" ]) diff --git a/replace/libreplace_macros.m4 b/replace/libreplace_macros.m4 index 1856eacf..0f7db298 100644 --- a/replace/libreplace_macros.m4 +++ b/replace/libreplace_macros.m4 @@ -76,7 +76,7 @@ fi ]) dnl AC_PROG_CC_FLAG(flag) -AC_DEFUN(AC_PROG_CC_FLAG, +AC_DEFUN([AC_PROG_CC_FLAG], [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1, [echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then @@ -90,7 +90,7 @@ rm -f conftest* dnl see if a declaration exists for a function or variable dnl defines HAVE_function_DECL if it exists dnl AC_HAVE_DECL(var, includes) -AC_DEFUN(AC_HAVE_DECL, +AC_DEFUN([AC_HAVE_DECL], [ AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[ AC_TRY_COMPILE([$2],[int i = (int)$1], @@ -283,7 +283,7 @@ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRIN dnl check if the prototype in the header matches the given one dnl AC_VERIFY_C_PROTOTYPE(prototype,functionbody,[IF-TRUE].[IF-FALSE],[extraheaders]) -AC_DEFUN(AC_VERIFY_C_PROTOTYPE, +AC_DEFUN([AC_VERIFY_C_PROTOTYPE], [AC_CACHE_CHECK([for prototype $1], AS_TR_SH([ac_cv_c_prototype_$1]), AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_INCLUDES_DEFAULT @@ -301,7 +301,7 @@ AC_DEFUN(AC_VERIFY_C_PROTOTYPE, AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4]) ]) -AC_DEFUN(LIBREPLACE_PROVIDE_HEADER, +AC_DEFUN([LIBREPLACE_PROVIDE_HEADER], [AC_CHECK_HEADER([$1], [ AC_CONFIG_COMMANDS(rm-$1, [rm -f $libreplacedir/$1], [libreplacedir=$libreplacedir]) ], [ AC_CONFIG_COMMANDS(mk-$1, [echo "#include \"replace.h\"" > $libreplacedir/$1], [libreplacedir=$libreplacedir]) ] diff --git a/replace/libreplace_network.m4 b/replace/libreplace_network.m4 index 4edb55c0..7ff7f852 100644 --- a/replace/libreplace_network.m4 +++ b/replace/libreplace_network.m4 @@ -1,4 +1,4 @@ -AC_DEFUN_ONCE(AC_LIBREPLACE_NETWORK_CHECKS, +AC_DEFUN_ONCE([AC_LIBREPLACE_NETWORK_CHECKS], [ echo "LIBREPLACE_NETWORK_CHECKS: START" |