svn commit: samba r23499 - in branches/SAMBA_3_0_26/source: .

jerry at samba.org jerry at samba.org
Thu Jun 14 14:45:33 GMT 2007


Author: jerry
Date: 2007-06-14 14:45:33 +0000 (Thu, 14 Jun 2007)
New Revision: 23499

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23499

Log:
merge libaddns build defaults from SAMBA_3_0
Modified:
   branches/SAMBA_3_0_26/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0_26/source/configure.in
===================================================================
--- branches/SAMBA_3_0_26/source/configure.in	2007-06-14 14:42:53 UTC (rev 23498)
+++ branches/SAMBA_3_0_26/source/configure.in	2007-06-14 14:45:33 UTC (rev 23499)
@@ -4868,12 +4868,12 @@
 LIBADDNS=
 AC_MSG_CHECKING(whether to build the libaddns shared library)
 AC_ARG_WITH(libaddns,
-[  --with-libaddns         Build the libaddns shared library (default=yes if shared libs supported)],
+[  --with-libaddns         Build the libaddns shared library (default=no undefined API)],
 [ case "$withval" in
-  no)
+  *)
      AC_MSG_RESULT(no)
      ;;
-  *)
+  yes)
      if test $BLDSHARED = true; then
         LIBADDNS_SHARED=bin/libaddns.$SHLIBEXT
         LIBADDNS=libaddns
@@ -4888,22 +4888,7 @@
      INSTALL_LIBADDNS=installlibaddns
      UNINSTALL_LIBADDNS=uninstalllibaddns
      ;;
-  esac ],
-[
-# if unspecified, default is to built it if possible.
-  if test $BLDSHARED = true; then
-     LIBADDNS_SHARED=bin/libaddns.$SHLIBEXT
-     LIBADDNS=libaddns
-     AC_MSG_RESULT(yes)
-   else
-     enable_static=yes
-     AC_MSG_RESULT(no shared library support -- will supply static library)
-   fi
-   if test $enable_static = yes; then
-     LIBADDNS=libaddns
-  fi]
-  INSTALL_LIBADDNS=installlibaddns
-  UNINSTALL_LIBADDNS=uninstalllibaddns
+  esac ]
 )
 
 #################################################



More information about the samba-cvs mailing list