Skip to content

Commit

Permalink
Adding the talloc 2.0.1 source first
Browse files Browse the repository at this point in the history
  • Loading branch information
karthick18 committed Jan 18, 2011
0 parents commit 602b671
Show file tree
Hide file tree
Showing 106 changed files with 50,087 additions and 0 deletions.
62 changes: 62 additions & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#!gmake
#
prefix = @prefix@
datarootdir = @datarootdir@
exec_prefix = @exec_prefix@
includedir = @includedir@
libdir = @libdir@
mandir = @mandir@
VPATH = @srcdir@:@libreplacedir@
srcdir = @srcdir@
builddir = @builddir@
sharedbuilddir = @sharedbuilddir@
XSLTPROC = @XSLTPROC@
INSTALLCMD = @INSTALL@
CC = @CC@
CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I@srcdir@
EXTRA_TARGETS = @DOC_TARGET@
PICFLAG = @PICFLAG@
TALLOC_VERSION = @TALLOC_VERSION@
TALLOC_VERSION_MAJOR = @TALLOC_VERSION_MAJOR@
TALLOC_VERSION_MINOR = @TALLOC_VERSION_MINOR@
TALLOC_VERSION_RELEASE = @TALLOC_VERSION_RELEASE@
SHLIBEXT = @SHLIBEXT@
SHLD = @SHLD@
SHLD_FLAGS = @SHLD_FLAGS@
tallocdir = @tallocdir@

LIBOBJ = $(TALLOC_OBJ) @LIBREPLACEOBJ@

SONAMEFLAG = @SONAMEFLAG@
VERSIONSCRIPT = @VERSIONSCRIPT@
EXPORTSFILE = @EXPORTSFILE@

all:: showflags $(EXTRA_TARGETS)

include $(tallocdir)/rules.mk
include $(tallocdir)/talloc.mk

@TALLOC_COMPAT1_MK@

$(TALLOC_SOLIB): $(LIBOBJ)
$(SHLD) $(SHLD_FLAGS) -o $@ $(LIBOBJ) $(VERSIONSCRIPT) $(EXPORTSFILE) $(SONAMEFLAG)$(TALLOC_SONAME)

shared-build: all
${INSTALLCMD} -d $(sharedbuilddir)/lib
${INSTALLCMD} -m 644 libtalloc.a $(sharedbuilddir)/lib
${INSTALLCMD} -m 755 $(TALLOC_SOLIB) $(sharedbuilddir)/lib
ln -sf $(TALLOC_SOLIB) $(sharedbuilddir)/lib/$(TALLOC_SONAME)
ln -sf $(TALLOC_SOLIB) $(sharedbuilddir)/lib/libtalloc.so
${INSTALLCMD} -d $(sharedbuilddir)/include
${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(sharedbuilddir)/include

check: test

installcheck:: test install

distclean:: clean
rm -f Makefile
rm -f config.log config.status config.h config.cache

realdistclean:: distclean
rm -f configure config.h.in
13 changes: 13 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
1.0.1 26 May 2007

BUGS

* Set name of correctly when using talloc_append_string() (metze)

LICENSE

* Change license of files in lib/replace to LGPL (was GPL). (jelmer)

1.0.0 30 April 2007

Initial release.
1 change: 1 addition & 0 deletions aclocal.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
m4_include(libreplace.m4)
14 changes: 14 additions & 0 deletions autogen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh

rm -rf autom4te.cache
rm -f configure config.h.in

IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
autoconf $IPATHS || exit 1
autoheader $IPATHS || exit 1

rm -rf autom4te.cache

echo "Now run ./configure and then make."
exit 0

14 changes: 14 additions & 0 deletions build_macros.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
AC_DEFUN(BUILD_WITH_SHARED_BUILD_DIR,
[ AC_ARG_WITH([shared-build-dir],
[AC_HELP_STRING([--with-shared-build-dir=DIR],
[temporary build directory where libraries are installed [$srcdir/sharedbuild]])])
sharedbuilddir="$srcdir/sharedbuild"
if test x"$with_shared_build_dir" != x; then
sharedbuilddir=$with_shared_build_dir
CFLAGS="$CFLAGS -I$with_shared_build_dir/include"
LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib"
fi
AC_SUBST(sharedbuilddir)
])

51 changes: 51 additions & 0 deletions compat/talloc_compat1.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
Samba trivial allocation library - compat functions
Copyright (C) Stefan Metzmacher 2009
** NOTE! The following LGPL license applies to the talloc
** library. This does NOT imply that all of Samba is released
** under the LGPL
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

/*
* This file contains only function to build a
* compat talloc.so.1 library on top of talloc.so.2
*/

#include "replace.h"
#include "talloc.h"

void *_talloc_reference(const void *context, const void *ptr);
void *_talloc_reference(const void *context, const void *ptr) {
return _talloc_reference_loc(context, ptr,
"Called from talloc compat1 "
"_talloc_reference");
}

void *_talloc_steal(const void *new_ctx, const void *ptr);
void *_talloc_steal(const void *new_ctx, const void *ptr)
{
return talloc_reparent(talloc_parent(ptr), new_ctx, ptr);
}

#undef talloc_free
int talloc_free(void *ptr);
int talloc_free(void *ptr)
{
return talloc_unlink(talloc_parent(ptr), ptr);
}

14 changes: 14 additions & 0 deletions compat/talloc_compat1.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
TALLOC_COMPAT1_MK=""
AC_SUBST(TALLOC_COMPAT1_MK)

AC_ARG_ENABLE(talloc-compat1,
[AS_HELP_STRING([--enable-talloc-compat1],
[Build talloc 1.x.x compat library [default=no]])],
[ enable_talloc_compat1=$enableval ],
[ enable_talloc_compat1=no ]
)

if test "x$enable_talloc_compat1" = x"yes"; then
TALLOC_COMPAT1_MK='include $(tallocdir)/compat/talloc_compat1.mk'
fi

21 changes: 21 additions & 0 deletions compat/talloc_compat1.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
talloccompatdir := $(tallocdir)/compat

TALLOC_COMPAT1_VERSION_MAJOR = 1
TALLOC_COMPAT1_OBJ = $(talloccompatdir)/talloc_compat1.o

TALLOC_COMPAT1_SOLIB = libtalloc-compat1-$(TALLOC_VERSION).$(SHLIBEXT)
TALLOC_COMPAT1_SONAME = libtalloc.$(SHLIBEXT).$(TALLOC_COMPAT1_VERSION_MAJOR)

$(TALLOC_COMPAT1_SOLIB): $(TALLOC_COMPAT1_OBJ) $(TALLOC_SOLIB)
$(SHLD) $(SHLD_FLAGS) -o $@ $(TALLOC_COMPAT1_OBJ) \
$(TALLOC_SOLIB) $(SONAMEFLAG)$(TALLOC_COMPAT1_SONAME)

all:: $(TALLOC_COMPAT1_SOLIB)

install::
${INSTALLCMD} -d $(DESTDIR)$(libdir)
${INSTALLCMD} -m 755 $(TALLOC_COMPAT1_SOLIB) $(DESTDIR)$(libdir)

clean::
rm -f $(TALLOC_COMPAT1_OBJ) $(TALLOC_COMPAT1_SOLIB)

Loading

0 comments on commit 602b671

Please sign in to comment.