[pdbsql-cvs] SF.net SVN: pdbsql:[167] branches/pdbsql_34

[<he...@us...>]

Revision: 167
          http://pdbsql.svn.sourceforge.net/pdbsql/?rev=167&view=rev
Author:   herwinw
Date:     2009-08-04 17:47:28 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Added talloc libraries to the makefile, it works at first sight

The --with-samba-dir directive should now point at the root of the source, *not* at the source3 directory inside

Modified Paths:
--------------
    branches/pdbsql_34/Makefile.in
    branches/pdbsql_34/configure.in

Modified: branches/pdbsql_34/Makefile.in
===================================================================
--- branches/pdbsql_34/Makefile.in	2009-08-03 21:24:03 UTC (rev 166)
+++ branches/pdbsql_34/Makefile.in	2009-08-04 17:47:28 UTC (rev 167)
@@ -9,9 +9,10 @@
 
 MYSQL_LIBS = @MYSQL_LIBS@
 PGSQL_LIBS = @PGSQL_LIBS@
+TALLOC_LIBS = -ltalloc
 SOURCEDIR = @SOURCEDIR@
 LIBDIR = @LIBDIR@
-CFLAGS = -Wall @CFLAGS@ -I$(SOURCEDIR) -I$(SOURCEDIR)/include -I$(SOURCEDIR)/librpc -I$(SOURCEDIR)/../lib/replace -I$(SOURCEDIR)/../lib/tdb/include -I$(SOURCEDIR)/../lib/tevent -I$(SOURCEDIR)/..
+CFLAGS = -Wall @CFLAGS@ -I$(SOURCEDIR)/source3 -I$(SOURCEDIR)/source3/include -I$(SOURCEDIR)/source3/librpc -I$(SOURCEDIR)/lib/replace -I$(SOURCEDIR)/lib/tdb/include -I$(SOURCEDIR)/lib/tevent -I$(SOURCEDIR)/ -I$(SOURCEDIR)/lib/talloc
 
 all: $(addsuffix .$(SHLIBEXT), $(modules))
 
@@ -19,13 +20,13 @@
 	$(CC) $(CFLAGS) -fPIC -c $< 
 
 mysql.$(SHLIBEXT): pdb_mysql.o pdb_sql.o
-	$(CC) -shared -o $@ $^ $(MYSQL_LIBS)
+	$(CC) -shared -o $@ $^ $(MYSQL_LIBS) $(TALLOC_LIBS)
 
 pgsql.$(SHLIBEXT): pdb_pgsql.o pdb_sql.o
-	$(CC) -shared -o $@ $^ $(PGSQL_LIBS)
+	$(CC) -shared -o $@ $^ $(PGSQL_LIBS) $(TALLOC_LIBS)
 
 multi.$(SHLIBEXT): pdb_multi.o
-	$(CC) -shared -o $@ $^
+	$(CC) -shared -o $@ $^ $(TALLOC_LIBS)
 
 Makefile: Makefile.in config.status
 	./config.status

Modified: branches/pdbsql_34/configure.in
===================================================================
--- branches/pdbsql_34/configure.in	2009-08-03 21:24:03 UTC (rev 166)
+++ branches/pdbsql_34/configure.in	2009-08-04 17:47:28 UTC (rev 167)
@@ -32,17 +32,17 @@
 	fi
 ])
 
-if test -f "$SOURCEDIR/source/dynconfig.c"; then
- 	SOURCEDIR="$SOURCEDIR/source"
+if test -f "$SOURCEDIR/source3/dynconfig.c"; then
+ 	SOURCEDIR="$SOURCEDIR"
 else if test -f "$SOURCEDIR/dynconfig.c"; then
-	SOURCEDIR="$SOURCEDIR"
+	SOURCEDIR="$SOURCEDIR/.."
      else 
 	AC_MSG_ERROR([Unable to find Samba sources in $SOURCEDIR. Please specify correct value to --with-samba-dir=])
   fi
 fi
 
 if test -z "$LIBDIR"; then
-	prefix=`grep "^prefix=" $SOURCEDIR/Makefile | cut -d = -f 2`
+	prefix=`grep "^prefix=" $SOURCEDIR/source3/Makefile | cut -d = -f 2`
 	LIBDIR="$prefix/lib"
 fi
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.