diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-20 01:19:59 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-20 01:19:59 +0100 |
| commit | b487ecdfad4518936cc542379b7f0102b38b3c62 (patch) | |
| tree | bf9dfc798a2fdecea7fe4176eb5597caba092e64 /source4/build/m4 | |
| parent | ad5861a795106f544f31d292ab1360e35bc79932 (diff) | |
| download | samba-b487ecdfad4518936cc542379b7f0102b38b3c62.tar.gz samba-b487ecdfad4518936cc542379b7f0102b38b3c62.tar.bz2 samba-b487ecdfad4518936cc542379b7f0102b38b3c62.zip | |
build: Fix handling of external pkg-config dependencies when generating pkg-config files.
(This used to be commit 88f9e11286bf0f12fc766dbf21f311e5373f0811)
Diffstat (limited to 'source4/build/m4')
| -rw-r--r-- | source4/build/m4/public.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 9e82e6aaf1..6d693eaeee 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -8,7 +8,7 @@ dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems) dnl dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) dnl -dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags) +dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags,pcname) dnl dnl SMB_ENABLE(name,default_build) dnl @@ -34,7 +34,7 @@ ENABLE = YES " ]) -dnl SMB_LIBRARY(name,description,obj_files,required_subsystems,version,so_version,cflags,ldflags) +dnl SMB_LIBRARY(name,description,obj_files,required_subsystems,version,so_version,cflags,ldflags,pcname) AC_DEFUN([SMB_LIBRARY], [ SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES @@ -48,6 +48,7 @@ VERSION = $5 SO_VERSION = $6 CFLAGS = $7 LDFLAGS = $8 +PC_NAME = $9 ENABLE = YES # End Library $1 ################################### @@ -93,7 +94,8 @@ AC_DEFUN([SMB_EXT_LIB_FROM_PKGCONFIG], [`$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'`]) + [`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`], + [ $2 ]) ac_cv_$1_found=yes else @@ -125,7 +127,7 @@ include $1 " ]) -dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags) +dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags,pcname) AC_DEFUN([SMB_EXT_LIB], [ @@ -137,6 +139,7 @@ LIBS = $2 CFLAGS = $3 CPPFLAGS = $4 LDFLAGS = $5 +PC_NAME = $6 # End Ext Lib $1 ################################### " |