From: Jelmer Vernooij Date: Fri, 4 Apr 2008 14:49:22 +0000 (+0200) Subject: Regenerate configure. X-Git-Url: http://git.samba.org/samba.git/?p=jelmer%2Fsamba4-debian.git;a=commitdiff_plain;h=8fa2ec161137784530de942c05aad11a9ac8da67;ds=sidebyside Regenerate configure. --- diff --git a/source/configure b/source/configure index 2d57f21c1..44322773b 100755 --- a/source/configure +++ b/source/configure @@ -740,6 +740,7 @@ POPT_LIBS POPT_CFLAGS poptdir POPT_OBJ +HAVE_PERL_EXTUTILS_MAKEMAKER PKG_CONFIG tallocdir TALLOC_OBJ @@ -34219,6 +34220,16 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES esac +# Check whether ExtUtils::ExtMaker is available + +if perl -e "use ExtUtils::MakeMaker" 2>/dev/null; then + HAVE_PERL_EXTUTILS_MAKEMAKER=1 +else + HAVE_PERL_EXTUTILS_MAKEMAKER=0 +fi + + + ac_config_files="$ac_config_files lib/registry/registry.pc" @@ -34234,6 +34245,8 @@ ac_config_files="$ac_config_files param/samba-hostconfig.pc" ac_config_files="$ac_config_files librpc/dcerpc_samr.pc" +ac_config_files="$ac_config_files librpc/dcerpc_atsvc.pc" + @@ -41419,6 +41432,7 @@ use vars qw(%enabled %config); POPT_CFLAGS => '$POPT_CFLAGS', poptdir => '$poptdir', POPT_OBJ => '$POPT_OBJ', + HAVE_PERL_EXTUTILS_MAKEMAKER => '$HAVE_PERL_EXTUTILS_MAKEMAKER', PKG_CONFIG => '$PKG_CONFIG', tallocdir => '$tallocdir', TALLOC_OBJ => '$TALLOC_OBJ', @@ -42054,6 +42068,7 @@ do "auth/gensec/gensec.pc") CONFIG_FILES="$CONFIG_FILES auth/gensec/gensec.pc" ;; "param/samba-hostconfig.pc") CONFIG_FILES="$CONFIG_FILES param/samba-hostconfig.pc" ;; "librpc/dcerpc_samr.pc") CONFIG_FILES="$CONFIG_FILES librpc/dcerpc_samr.pc" ;; + "librpc/dcerpc_atsvc.pc") CONFIG_FILES="$CONFIG_FILES librpc/dcerpc_atsvc.pc" ;; "lib/ldb/ldb.pc") CONFIG_FILES="$CONFIG_FILES lib/ldb/ldb.pc" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; @@ -42283,6 +42298,7 @@ POPT_LIBS!$POPT_LIBS$ac_delim POPT_CFLAGS!$POPT_CFLAGS$ac_delim poptdir!$poptdir$ac_delim POPT_OBJ!$POPT_OBJ$ac_delim +HAVE_PERL_EXTUTILS_MAKEMAKER!$HAVE_PERL_EXTUTILS_MAKEMAKER$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim tallocdir!$tallocdir$ac_delim TALLOC_OBJ!$TALLOC_OBJ$ac_delim @@ -42309,7 +42325,7 @@ INSTALL_LINK_FLAGS!$INSTALL_LINK_FLAGS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -42899,6 +42915,7 @@ POPT_LIBS = $POPT_LIBS POPT_CFLAGS = $POPT_CFLAGS poptdir = $poptdir POPT_OBJ = $POPT_OBJ +HAVE_PERL_EXTUTILS_MAKEMAKER = $HAVE_PERL_EXTUTILS_MAKEMAKER PKG_CONFIG = $PKG_CONFIG tallocdir = $tallocdir TALLOC_OBJ = $TALLOC_OBJ diff --git a/source/version.h b/source/version.h index d26146064..a680dfaf2 100644 --- a/source/version.h +++ b/source/version.h @@ -3,12 +3,12 @@ #define SAMBA_VERSION_MINOR 0 #define SAMBA_VERSION_RELEASE 0 #define SAMBA_VERSION_ALPHA_RELEASE 4 -#define SAMBA_VERSION_GIT_COMMIT_ABBREV "b64df2f" -#define SAMBA_VERSION_GIT_COMMIT_TIME 1207237106 -#define SAMBA_VERSION_GIT_COMMIT_FULLREV "b64df2f0fa1db9c7f4673bbb31c3064d58d5fef0" -#define SAMBA_VERSION_GIT_COMMIT_DATE "Thu Apr 3 17:38:26 2008 +0200" -#define SAMBA_VERSION_OFFICIAL_STRING "4.0.0alpha4-GIT-b64df2f" +#define SAMBA_VERSION_GIT_COMMIT_ABBREV "a9f0a67" +#define SAMBA_VERSION_GIT_COMMIT_TIME 1207318100 +#define SAMBA_VERSION_GIT_COMMIT_FULLREV "a9f0a672f2c32bfbe1ec931ed37f8dfcc525b4dc" +#define SAMBA_VERSION_GIT_COMMIT_DATE "Fri Apr 4 16:08:20 2008 +0200" +#define SAMBA_VERSION_OFFICIAL_STRING "4.0.0alpha4-GIT-a9f0a67" /* Version for mkrelease.sh: -SAMBA_VERSION_STRING=4.0.0alpha4-GIT-b64df2f +SAMBA_VERSION_STRING=4.0.0alpha4-GIT-a9f0a67 */ -#define SAMBA_VERSION_STRING "4.0.0alpha4-GIT-b64df2f" +#define SAMBA_VERSION_STRING "4.0.0alpha4-GIT-a9f0a67"