summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-10-18 19:34:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:04 -0500
commitdf484a87afd9747bb02c6d40f67470771b2e1b53 (patch)
tree3de340f9d20e6986d72a70ff0baf74e9faa437bc
parentc0d80e0dfb5e68c319feb7f35d0411909797af2c (diff)
downloadsamba-df484a87afd9747bb02c6d40f67470771b2e1b53.tar.gz
samba-df484a87afd9747bb02c6d40f67470771b2e1b53.tar.bz2
samba-df484a87afd9747bb02c6d40f67470771b2e1b53.zip
r11165: deparate the library install commands from the logic of whether to build the library at all. Still needs some more cleanup but this works for now
(This used to be commit df998bfa8e00a736250eb5a7b31ed53abd6a4241)
-rw-r--r--source3/configure.in22
1 files changed, 8 insertions, 14 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 901455f0ae..f5ac605204 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3967,6 +3967,14 @@ fi
INSTALLCLIENTCMD_SH=:
INSTALLCLIENTCMD_A=:
+
+if test $BLDSHARED = true; then
+ INSTALLCLIENTCMD_SH="\$(INSTALLCMD)"
+fi
+if test $enable_static = yes; then
+ INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
+fi
+
INSTALLCLIENT=
LIBSMBCLIENT_SHARED=
LIBSMBCLIENT=
@@ -3979,9 +3987,6 @@ AC_ARG_WITH(libsmbclient,
;;
*)
if test $BLDSHARED = true; then
- INSTALLCLIENTCMD_SH="\$(INSTALLCMD)"
- ## build the static version of libsmbclient as well
- INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
LIBSMBCLIENT=libsmbclient
AC_MSG_RESULT(yes)
@@ -3990,7 +3995,6 @@ AC_ARG_WITH(libsmbclient,
AC_MSG_RESULT(no shared library support -- will supply static library)
fi
if test $enable_static = yes; then
- INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
LIBSMBCLIENT=libsmbclient
fi
INSTALLCLIENT=installclientlib
@@ -3999,7 +4003,6 @@ AC_ARG_WITH(libsmbclient,
[
# if unspecified, default is to built it iff possible.
if test $BLDSHARED = true; then
- INSTALLCLIENTCMD_SH="\$(INSTALLCMD)"
LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
LIBSMBCLIENT=libsmbclient
AC_MSG_RESULT(yes)
@@ -4008,14 +4011,11 @@ AC_ARG_WITH(libsmbclient,
AC_MSG_RESULT(no shared library support -- will supply static library)
fi
if test $enable_static = yes; then
- INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
LIBSMBCLIENT=libsmbclient
fi]
INSTALLCLIENT=installclientlib
)
-INSTALLCLIENTCMD_SH=:
-INSTALLCLIENTCMD_A=:
INSTALLCLIENT=
LIBSMBSHAREMODES_SHARED=
LIBSMBSHAREMODES=
@@ -4028,9 +4028,6 @@ AC_ARG_WITH(libsmbsharemodes,
;;
*)
if test $BLDSHARED = true; then
- INSTALLCLIENTCMD_SH="\$(INSTALLCMD)"
- ## build the static version of libsmbsharemodes as well
- INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
LIBSMBSHAREMODES_SHARED=bin/libsmbsharemodes.$SHLIBEXT
LIBSMBSHAREMODES=libsmbsharemodes
AC_MSG_RESULT(yes)
@@ -4039,7 +4036,6 @@ AC_ARG_WITH(libsmbsharemodes,
AC_MSG_RESULT(no shared library support -- will supply static library)
fi
if test $enable_static = yes; then
- INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
LIBSMBSHAREMODES=libsmbsharemodes
fi
INSTALLCLIENT=installclientlib
@@ -4048,7 +4044,6 @@ AC_ARG_WITH(libsmbsharemodes,
[
# if unspecified, default is to built it iff possible.
if test $BLDSHARED = true; then
- INSTALLCLIENTCMD_SH="\$(INSTALLCMD)"
LIBSMBSHAREMODES_SHARED=bin/libsmbsharemodes.$SHLIBEXT
LIBSMBSHAREMODES=libsmbsharemodes
AC_MSG_RESULT(yes)
@@ -4057,7 +4052,6 @@ AC_ARG_WITH(libsmbsharemodes,
AC_MSG_RESULT(no shared library support -- will supply static library)
fi
if test $enable_static = yes; then
- INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
LIBSMBSHAREMODES=libsmbsharemodes
fi]
INSTALLCLIENT=installclientlib