[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-657-gcbed074
Jelmer Vernooij
jelmer at samba.org
Fri Feb 8 15:41:18 GMT 2008
The branch, v4-0-test has been updated
via cbed074f2841b79cc0f23ad52b1fa34515f706a9 (commit)
from 5c2be1e8a985332e1e81eeab1dc9b50d7f867f98 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit cbed074f2841b79cc0f23ad52b1fa34515f706a9
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 8 16:28:04 2008 +0100
Reformat SMB_EXT_LIB_FROM_PKGCONFIG: fix spacing and indentation.
Sorry, could not resist: While trying to understand this bit of magic,
I had to bring indentation into shape to see more clearly what is going on.
Also, mixed tabs/spaces are changed to tabs.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/build/m4/public.m4 | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index 81da34d..4192128 100644
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -64,30 +64,28 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
fi
if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://pkg-config.freedesktop.org/ to get pkg-config."
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://pkg-config.freedesktop.org/ to get pkg-config."
ac_cv_$1_found=no
else
if $PKG_CONFIG --atleast-pkgconfig-version 0.9.0; then
- AC_MSG_CHECKING(for $2)
+ AC_MSG_CHECKING(for $2)
- if $PKG_CONFIG --exists '$2' ; then
+ if $PKG_CONFIG --exists '$2' ; then
AC_MSG_RESULT(yes)
-
$1_CFLAGS="`$PKG_CONFIG --cflags '$2'`"
- OLD_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $$1_CFLAGS"
- AC_MSG_CHECKING([that the C compiler can use the $1_CFLAGS])
- AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
+ OLD_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $$1_CFLAGS"
+ AC_MSG_CHECKING([that the C compiler can use the $1_CFLAGS])
+ AC_TRY_RUN([#include "${srcdir-.}/build/tests/trivial.c"],
SMB_ENABLE($1, YES)
- AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(yes),
AC_MSG_RESULT(no),
AC_MSG_WARN([cannot run when cross-compiling]))
- CFLAGS="$OLD_CFLAGS"
-
+ CFLAGS="$OLD_CFLAGS"
SMB_EXT_LIB($1,
[`$PKG_CONFIG --libs-only-l '$2'`],
@@ -97,17 +95,17 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG],
[ $2 ])
ac_cv_$1_found=yes
- else
+ else
AC_MSG_RESULT(no)
- $PKG_CONFIG --errors-to-stdout --print-errors '$2'
- ac_cv_$1_found=no
- fi
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://pkg-config.freedesktop.org/"
+ $PKG_CONFIG --errors-to-stdout --print-errors '$2'
ac_cv_$1_found=no
- fi
- fi
+ fi
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://pkg-config.freedesktop.org/"
+ ac_cv_$1_found=no
+ fi
+ fi
if test x$ac_cv_$1_found = x"yes"; then
ifelse([$3], [], [echo -n ""], [$3])
else
--
Samba Shared Repository
More information about the samba-cvs
mailing list