diff options
| author | Gerald Carter <jerry@samba.org> | 2005-10-18 19:34:42 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-10-18 19:34:42 +0000 |
| commit | 0c9ca2faa12eea7a9ee6db23f5494d25a40871c7 (patch) | |
| tree | 0aee8ebe0056166dd111adc17358b65c2c57d86b | |
| parent | 1736544711589bebfbb80c61e693b46698e3704a (diff) | |
| download | samba-3.0.21pre1.tar.gz | |
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 nowsamba-3.0.21pre1
| -rw-r--r-- | source/configure.in | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/source/configure.in b/source/configure.in index 901455f0ae9..f5ac6052041 100644 --- a/source/configure.in +++ b/source/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 |