diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-04-15 09:54:41 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-04-15 09:54:41 +0200 |
| commit | b967afca648eea481e586f367f99464418cf8468 (patch) | |
| tree | 3fbe9cc92a21013cbd1eb2b6fa1b73ccddfbb151 /source4/build/m4/public.m4 | |
| parent | 9cd04363f56ba5ee4f8b1ffaf662fe81cc995e99 (diff) | |
| parent | afaba23131dc079be3cd92e87495ec8b2ebdc4ae (diff) | |
| download | samba-b967afca648eea481e586f367f99464418cf8468.tar.gz samba-b967afca648eea481e586f367f99464418cf8468.tar.bz2 samba-b967afca648eea481e586f367f99464418cf8468.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit e891157b4ec7b2f845fb20c4106d80bf169f2072)
Diffstat (limited to 'source4/build/m4/public.m4')
| -rw-r--r-- | source4/build/m4/public.m4 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index eb673446c7..1eae998ca4 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -4,8 +4,6 @@ dnl Copyright (C) 2004 Stefan Metzmacher dnl Copyright (C) 2004-2005 Jelmer Vernooij dnl Published under the GPL dnl -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) @@ -22,16 +20,15 @@ dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems,cflags) AC_DEFUN([SMB_SUBSYSTEM], [ MAKE_SETTINGS="$MAKE_SETTINGS -$1_OBJ_FILES = $2 $1_CFLAGS = $4 $1_ENABLE = YES +$1_OBJ_FILES = $2 " SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS ################################### # Start Subsystem $1 @<:@SUBSYSTEM::$1@:>@ -OBJ_FILES = \$($1_OBJ_FILES) PRIVATE_DEPENDENCIES = $3 CFLAGS = \$($1_CFLAGS) ENABLE = YES @@ -44,20 +41,17 @@ dnl SMB_LIBRARY(name,obj_files,required_subsystems,version,so_version,cflags,ldf AC_DEFUN([SMB_LIBRARY], [ MAKE_SETTINGS="$MAKE_SETTINGS -$1_OBJ_FILES = $2 $1_CFLAGS = $6 $1_LDFLAGS = $7 $1_ENABLE = YES +$1_OBJ_FILES = $2 " SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES ################################### # Start Library $1 @<:@LIBRARY::$1@:>@ -OBJ_FILES = \$($1_OBJ_FILES) PRIVATE_DEPENDENCIES = $3 -VERSION = $4 -SO_VERSION = $5 CFLAGS = \$($1_CFLAGS) LDFLAGS = \$($1_LDFLAGS) ENABLE = YES |