sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Move the definition of SMB_LIBRARY to aclocal.m4.

Browse Source 
Michael
(This used to be commit 4724b13ed8)
This commit is contained in:
Michael Adam 2008-02-21 14:07:45 +01:00
parent d29c816b61
commit 0d7f555335
2 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source3/configure.in
View File

@ -4710,73 +4710,6 @@ AC_ARG_WITH([static-libs],
[])
dnl SMB_LIBRARY(name)
dnl
dnl configure build and use of an (internal) shared library
dnl
AC_DEFUN([SMB_LIBRARY],
[
m4_pushdef([LIBNAME], [lib$1])
m4_pushdef([LIBUC], [m4_toupper(LIBNAME)])
m4_pushdef([LIBLIBS], [-l$1])
LIBUC[_SHARED_TARGET]=bin/LIBNAME.$SHLIBEXT
LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
LIBUC[_SHARED]=
LIBUC[_STATIC]=
LIBUC[_LIBS]=
AC_SUBST(LIBUC[_SHARED_TARGET])
AC_SUBST(LIBUC[_STATIC_TARGET])
AC_SUBST(LIBUC[_SHARED])
AC_SUBST(LIBUC[_STATIC])
AC_SUBST(LIBUC[_LIBS])
AC_MSG_CHECKING([whether to build the LIBNAME shared library])
AC_ARG_WITH(LIBNAME,
[AS_HELP_STRING([--with-LIBNAME],
[Build the LIBNAME shared library (default=yes if shared libs supported)])],
[
case "$withval" in
*)
AC_MSG_RESULT(no)
build_lib=no
;;
yes)
build_lib=yes
;;
esac
],
[
# if unspecified, default is to build it if possible.
build_lib=yes
]
)
if eval test x"$build_lib" = "xyes" -a $BLDSHARED = true; then
LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
AC_MSG_RESULT(yes)
if test x"$USESHARED" != x"true" -o x"$LINK_LIBUC" = "xSTATIC" ; then
LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
else
LIBUC[_LIBS]=LIBLIBS
fi
else
enable_static=yes
AC_MSG_RESULT(no shared library support -- will supply static library)
fi
if test $enable_static = yes; then
LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
fi
m4_popdef([LIBNAME])
m4_popdef([LIBUC])
m4_popdef([LIBLIBS])
])
SMB_LIBRARY(talloc)
SMB_LIBRARY(tdb)
SMB_LIBRARY(netapi)

67
source3/m4/aclocal.m4 vendored
View File

@ -53,6 +53,73 @@ AC_DEFUN(SMB_SUBSYSTEM,
ifelse([$2], , :, [rm -f $2])
])
dnl SMB_LIBRARY(name)
dnl
dnl configure build and use of an (internal) shared library
dnl
AC_DEFUN([SMB_LIBRARY],
[
m4_pushdef([LIBNAME], [lib$1])
m4_pushdef([LIBUC], [m4_toupper(LIBNAME)])
m4_pushdef([LIBLIBS], [-l$1])
LIBUC[_SHARED_TARGET]=bin/LIBNAME.$SHLIBEXT
LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
LIBUC[_SHARED]=
LIBUC[_STATIC]=
LIBUC[_LIBS]=
AC_SUBST(LIBUC[_SHARED_TARGET])
AC_SUBST(LIBUC[_STATIC_TARGET])
AC_SUBST(LIBUC[_SHARED])
AC_SUBST(LIBUC[_STATIC])
AC_SUBST(LIBUC[_LIBS])
AC_MSG_CHECKING([whether to build the LIBNAME shared library])
AC_ARG_WITH(LIBNAME,
[AS_HELP_STRING([--with-LIBNAME],
[Build the LIBNAME shared library (default=yes if shared libs supported)])],
[
case "$withval" in
*)
AC_MSG_RESULT(no)
build_lib=no
;;
yes)
build_lib=yes
;;
esac
],
[
# if unspecified, default is to build it if possible.
build_lib=yes
]
)
if eval test x"$build_lib" = "xyes" -a $BLDSHARED = true; then
LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
AC_MSG_RESULT(yes)
if test x"$USESHARED" != x"true" -o x"$LINK_LIBUC" = "xSTATIC" ; then
LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
else
LIBUC[_LIBS]=LIBLIBS
fi
else
enable_static=yes
AC_MSG_RESULT(no shared library support -- will supply static library)
fi
if test $enable_static = yes; then
LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
fi
m4_popdef([LIBNAME])
m4_popdef([LIBUC])
m4_popdef([LIBLIBS])
])
dnl AC_LIBTESTFUNC(lib, function, [actions if found], [actions if not found])
dnl Check for a function in a library, but don't keep adding the same library
dnl to the LIBS variable. Check whether the function is available in the