Merge branch 'singlepopt' into single

Conflicts:
	source4/Makefile

diff --cc source3/configure.in
Simple merge

diff --cc source3/samba4.m4
Simple merge

diff --cc source3/samba4.mk
Simple merge

diff --cc source4/Makefile
index 8f81055324fceff726950f1bbd8efe2d5ea55b17,41328cf03cb1d3009cc6f87ee856e308aebd7ab8..7679786acb9efb961b4641edeb74f13486af5dcc
--- 1/source4/Makefile
--- 2/source4/Makefile
+++ b/source4/Makefile
@@@ -70,9 -70,9 +70,9 @@@ smbreadlinesrcdir := lib/smbreadlin
  libmessagingsrcdir := lib/messaging
  libeventssrcdir := lib/events
  libcmdlinesrcdir := lib/cmdline
- poptsrcdir := lib/popt
+ poptsrcdir := ../popt
 -socketwrappersrcdir := lib/socket_wrapper
 -nsswrappersrcdir := lib/nss_wrapper
 +socketwrappersrcdir := ../socket_wrapper
 +nsswrappersrcdir := ../nss_wrapper
  appwebsrcdir := lib/appweb
  libstreamsrcdir := lib/stream
  libutilsrcdir := lib/util

diff --cc source4/configure.ac
Simple merge