From 6ad6506cb1483aad69c2273b539f876a8e948455 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Apr 2006 14:39:00 +0000
Subject: r14906: Move SWIG-specific files to scripting/swig/ (This used to be
 commit 222723e4434b85748aa82f192c5c4ce136933ce3)

---
 source4/scripting/config.m4      | 27 ----------------------
 source4/scripting/config.mk      | 48 ----------------------------------------
 source4/scripting/swig/config.m4 | 27 ++++++++++++++++++++++
 source4/scripting/swig/config.mk | 46 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 75 deletions(-)
 delete mode 100644 source4/scripting/config.m4
 delete mode 100644 source4/scripting/config.mk
 create mode 100644 source4/scripting/swig/config.m4
 create mode 100644 source4/scripting/swig/config.mk

(limited to 'source4/scripting')

diff --git a/source4/scripting/config.m4 b/source4/scripting/config.m4
deleted file mode 100644
index 02a563e167..0000000000
--- a/source4/scripting/config.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-dnl # Scripting subsystem
-
-# Check for python support
-
-PYTHON=
- 
-AC_ARG_WITH(python,
-[  --with-python=PYTHONNAME  build Python libraries],
-[ case "${withval-python}" in
-  yes)
-        PYTHON=python
-        ;;
-  no)
-        PYTHON=
-        ;;
-  *)
-        PYTHON=${withval-python}
-        ;;
-  esac ])
-
-if test x"$PYTHON" != "x"; then
-	incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
-	CPPFLAGS="$CPPFLAGS -I $incdir"
-fi
-
-AC_SUBST(PYTHON)
-
diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
deleted file mode 100644
index b5d848ce2b..0000000000
--- a/source4/scripting/config.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-include ejs/config.mk
-
-#######################
-# Start LIBRARY swig_tdb
-[LIBRARY::swig_tdb]
-LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
-OBJ_FILES = swig/tdb_wrap.o
-REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
-# End LIBRARY swig_tdb
-#######################
-
-#######################
-# Start LIBRARY swig_ldb
-[LIBRARY::swig_ldb]
-REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
-LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
-OBJ_FILES = swig/ldb_wrap.o
-# End LIBRARY swig_ldb
-#######################
-
-#######################
-# Start LIBRARY swig_dcerpc
-[LIBRARY::swig_dcerpc]
-LIBRARY_REALNAME = swig/_dcerpc.$(SHLIBEXT)
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
-OBJ_FILES = swig/dcerpc_wrap.o
-# End LIBRARY swig_dcerpc
-#######################
-
-# Swig extensions
-swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
-
-.SUFFIXES: _wrap.c .i
-
-.i_wrap.c:
-	swig -python $<
-
-SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
-
-scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
-
-clean::
-	-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
-
-# Swig testing
-
-swigtest: swig
-	./script/tests/test_swig.sh
diff --git a/source4/scripting/swig/config.m4 b/source4/scripting/swig/config.m4
new file mode 100644
index 0000000000..02a563e167
--- /dev/null
+++ b/source4/scripting/swig/config.m4
@@ -0,0 +1,27 @@
+dnl # Scripting subsystem
+
+# Check for python support
+
+PYTHON=
+ 
+AC_ARG_WITH(python,
+[  --with-python=PYTHONNAME  build Python libraries],
+[ case "${withval-python}" in
+  yes)
+        PYTHON=python
+        ;;
+  no)
+        PYTHON=
+        ;;
+  *)
+        PYTHON=${withval-python}
+        ;;
+  esac ])
+
+if test x"$PYTHON" != "x"; then
+	incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
+	CPPFLAGS="$CPPFLAGS -I $incdir"
+fi
+
+AC_SUBST(PYTHON)
+
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
new file mode 100644
index 0000000000..e0a265b679
--- /dev/null
+++ b/source4/scripting/swig/config.mk
@@ -0,0 +1,46 @@
+#######################
+# Start LIBRARY swig_tdb
+[LIBRARY::swig_tdb]
+LIBRARY_REALNAME = _tdb.$(SHLIBEXT)
+OBJ_FILES = tdb_wrap.o
+REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
+# End LIBRARY swig_tdb
+#######################
+
+#######################
+# Start LIBRARY swig_ldb
+[LIBRARY::swig_ldb]
+REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
+LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
+OBJ_FILES = ldb_wrap.o
+# End LIBRARY swig_ldb
+#######################
+
+#######################
+# Start LIBRARY swig_dcerpc
+[LIBRARY::swig_dcerpc]
+LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+OBJ_FILES = dcerpc_wrap.o
+# End LIBRARY swig_dcerpc
+#######################
+
+# Swig extensions
+swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
+
+.SUFFIXES: _wrap.c .i
+
+.i_wrap.c:
+	swig -python $<
+
+SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
+
+scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
+
+clean::
+	-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
+
+# Swig testing
+
+swigtest: swig
+	./script/tests/test_swig.sh
-- 
cgit