diff options
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/public.m4 | 9 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index ffdf92f784..bd98a400be 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -82,7 +82,8 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], 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 + SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0" + if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then AC_MSG_CHECKING(for $2) if $PKG_CONFIG --exists '$2' ; then @@ -99,11 +100,13 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], AC_MSG_WARN([cannot run when cross-compiling])) CFLAGS="$OLD_CFLAGS" + ac_cv_$1_libs_only_other="`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`" + LIB_REMOVE_USR_LIB(ac_cv_$1_libs_only_other) SMB_EXT_LIB($1, [`$PKG_CONFIG --libs-only-l '$2'`], [`$PKG_CONFIG --cflags-only-other '$2'`], [`$PKG_CONFIG --cflags-only-I '$2'`], - [`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`]) + [$ac_cv_$1_libs_only_other]) ac_cv_$1_found=yes else @@ -112,7 +115,7 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], 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 "*** Your version of pkg-config is too old. You need version $SAMBA_PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://pkg-config.freedesktop.org/" ac_cv_$1_found=no fi diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 3c84a91a59..0d19e41827 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -73,7 +73,7 @@ foreach my $key (values %$OUTPUT) { $shared_libs_used = 1; } if ($key->{TYPE} eq "MODULE" and @{$key->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) { - $mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += $key->{INIT_FUNCTION},\n"); + $mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS +=$key->{INIT_FUNCTION},\n"); } $mkenv->CFlags($key); } |