mirror of
https://github.com/haiwen/libsearpc.git
synced 2025-05-10 08:04:21 +00:00
Update configure.ac to remove checkout python headers
This commit is contained in:
plt
parent
56a4d930cb
commit
f560675030
@ -12,12 +12,8 @@ EXTRA_DIST = $(GNU_STANDARD_FILES)
|
||||
|
||||
EXTRA_DIST += libsearpc.pc.in
|
||||
|
||||
if COMPILE_PYTHON
|
||||
PYTHONDIR = pysearpc
|
||||
endif
|
||||
|
||||
if COMPILE_DEMO
|
||||
MAKE_DEMO = demo
|
||||
endif
|
||||
|
||||
SUBDIRS = json-glib lib ${PYTHONDIR} ${MAKE_DEMO} tests
|
||||
SUBDIRS = json-glib lib pysearpc ${MAKE_DEMO} tests
|
||||
47
configure.ac
47
configure.ac
@ -47,9 +47,7 @@ AC_MSG_CHECKING(for WIN32)
|
||||
if test "$MINGW32" = yes; then
|
||||
bwin32=true
|
||||
LIB_WS32=-lws2_32
|
||||
LIB_PYTHON=-lpython26
|
||||
AC_SUBST(LIB_WS32)
|
||||
AC_SUBST(LIB_PYTHON)
|
||||
AC_MSG_RESULT(compile in mingw32)
|
||||
fi
|
||||
|
||||
@ -64,23 +62,12 @@ fi
|
||||
|
||||
if test x$bmac = "xyes"; then
|
||||
server_pkg=no
|
||||
LIB_PYTHON=-lpython
|
||||
AC_SUBST(LIB_PYTHON)
|
||||
AC_MSG_RESULT(compile in mac)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([MACOS], [test "$bmac" = "yes"])
|
||||
AC_SUBST(MACOS)
|
||||
|
||||
# option: compile-python
|
||||
# default: no
|
||||
AC_ARG_ENABLE([compile-python],
|
||||
[AS_HELP_STRING([--enable-compile-python],
|
||||
[compile pysearpc @<:@default: no@:>@])],
|
||||
[compile_python=${enableval}], [compile_python=yes])
|
||||
|
||||
AM_CONDITIONAL([COMPILE_PYTHON], [test x${compile_python} = xyes])
|
||||
|
||||
# If we're building server release package, set the run-time path
|
||||
# for the executables. So that the loader will lookup shared libs
|
||||
# in 'lib' dir of the release package.
|
||||
@ -101,28 +88,26 @@ PKG_CHECK_MODULES(GLIB, [gobject-2.0 >= $GLIB_REQUIRED])
|
||||
AC_SUBST(GLIB_CFLAGS)
|
||||
AC_SUBST(GLIB_LIBS)
|
||||
|
||||
# conditinally check python and subst
|
||||
if test x${compile_python} = xyes; then
|
||||
AM_PATH_PYTHON([2.4])
|
||||
if test "$bwin32" = true; then
|
||||
if test x$PYTHON_DIR != x; then
|
||||
# set pyexecdir to somewhere like /c/Python26/Lib/site-packages
|
||||
pyexecdir=${PYTHON_DIR}/Lib/site-packages
|
||||
pythondir=${pyexecdir}
|
||||
pkgpyexecdir=${pyexecdir}/${PACKAGE}
|
||||
pkgpythondir=${pythondir}/${PACKAGE}
|
||||
fi
|
||||
fi
|
||||
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
|
||||
|
||||
if test "$bwin32" = true; then
|
||||
pyexecdir=${PYTHON_DIR}/Lib/site-packages
|
||||
pythondir=${pyexecdir}
|
||||
pkgpyexecdir=${pyexecdir}/${PACKAGE}
|
||||
pkgpythondir=${pythondir}/${PACKAGE}
|
||||
AM_PATH_PYTHON([2.4])
|
||||
if test "$bwin32" = true; then
|
||||
if test x$PYTHON_DIR != x; then
|
||||
# set pyexecdir to somewhere like /c/Python26/Lib/site-packages
|
||||
pyexecdir=${PYTHON_DIR}/Lib/site-packages
|
||||
pythondir=${pyexecdir}
|
||||
pkgpyexecdir=${pyexecdir}/${PACKAGE}
|
||||
pkgpythondir=${pythondir}/${PACKAGE}
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$bwin32" = true; then
|
||||
pyexecdir=${PYTHON_DIR}/Lib/site-packages
|
||||
pythondir=${pyexecdir}
|
||||
pkgpyexecdir=${pyexecdir}/${PACKAGE}
|
||||
pkgpythondir=${pythondir}/${PACKAGE}
|
||||
fi
|
||||
|
||||
|
||||
AC_CONFIG_SUBDIRS([json-glib])
|
||||
|
||||
AC_CONFIG_FILES([Makefile
|
||||
|
||||
@ -1,132 +0,0 @@
|
||||
#include "json-marshal.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
|
||||
|
||||
#ifdef G_ENABLE_DEBUG
|
||||
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
|
||||
#define g_marshal_value_peek_char(v) g_value_get_char (v)
|
||||
#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
|
||||
#define g_marshal_value_peek_int(v) g_value_get_int (v)
|
||||
#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
|
||||
#define g_marshal_value_peek_long(v) g_value_get_long (v)
|
||||
#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
|
||||
#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
|
||||
#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
|
||||
#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
|
||||
#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
|
||||
#define g_marshal_value_peek_float(v) g_value_get_float (v)
|
||||
#define g_marshal_value_peek_double(v) g_value_get_double (v)
|
||||
#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
|
||||
#define g_marshal_value_peek_param(v) g_value_get_param (v)
|
||||
#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
|
||||
#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
|
||||
#define g_marshal_value_peek_object(v) g_value_get_object (v)
|
||||
#define g_marshal_value_peek_variant(v) g_value_get_variant (v)
|
||||
#else /* !G_ENABLE_DEBUG */
|
||||
/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
|
||||
* Do not access GValues directly in your code. Instead, use the
|
||||
* g_value_get_*() functions
|
||||
*/
|
||||
#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
|
||||
#define g_marshal_value_peek_char(v) (v)->data[0].v_int
|
||||
#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
|
||||
#define g_marshal_value_peek_int(v) (v)->data[0].v_int
|
||||
#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
|
||||
#define g_marshal_value_peek_long(v) (v)->data[0].v_long
|
||||
#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
|
||||
#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
|
||||
#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
|
||||
#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
|
||||
#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
|
||||
#define g_marshal_value_peek_float(v) (v)->data[0].v_float
|
||||
#define g_marshal_value_peek_double(v) (v)->data[0].v_double
|
||||
#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
|
||||
#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
|
||||
#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
|
||||
#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
|
||||
#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
|
||||
#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
|
||||
#endif /* !G_ENABLE_DEBUG */
|
||||
|
||||
|
||||
/* VOID:VOID (./json-marshal.list:1) */
|
||||
|
||||
/* VOID:BOXED (./json-marshal.list:2) */
|
||||
|
||||
/* VOID:BOXED,STRING (./json-marshal.list:3) */
|
||||
void
|
||||
_json_marshal_VOID__BOXED_STRING (GClosure *closure,
|
||||
GValue *return_value G_GNUC_UNUSED,
|
||||
guint n_param_values,
|
||||
const GValue *param_values,
|
||||
gpointer invocation_hint G_GNUC_UNUSED,
|
||||
gpointer marshal_data)
|
||||
{
|
||||
typedef void (*GMarshalFunc_VOID__BOXED_STRING) (gpointer data1,
|
||||
gpointer arg_1,
|
||||
gpointer arg_2,
|
||||
gpointer data2);
|
||||
register GMarshalFunc_VOID__BOXED_STRING callback;
|
||||
register GCClosure *cc = (GCClosure*) closure;
|
||||
register gpointer data1, data2;
|
||||
|
||||
g_return_if_fail (n_param_values == 3);
|
||||
|
||||
if (G_CCLOSURE_SWAP_DATA (closure))
|
||||
{
|
||||
data1 = closure->data;
|
||||
data2 = g_value_peek_pointer (param_values + 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
data1 = g_value_peek_pointer (param_values + 0);
|
||||
data2 = closure->data;
|
||||
}
|
||||
callback = (GMarshalFunc_VOID__BOXED_STRING) (marshal_data ? marshal_data : cc->callback);
|
||||
|
||||
callback (data1,
|
||||
g_marshal_value_peek_boxed (param_values + 1),
|
||||
g_marshal_value_peek_string (param_values + 2),
|
||||
data2);
|
||||
}
|
||||
|
||||
/* VOID:BOXED,INT (./json-marshal.list:4) */
|
||||
void
|
||||
_json_marshal_VOID__BOXED_INT (GClosure *closure,
|
||||
GValue *return_value G_GNUC_UNUSED,
|
||||
guint n_param_values,
|
||||
const GValue *param_values,
|
||||
gpointer invocation_hint G_GNUC_UNUSED,
|
||||
gpointer marshal_data)
|
||||
{
|
||||
typedef void (*GMarshalFunc_VOID__BOXED_INT) (gpointer data1,
|
||||
gpointer arg_1,
|
||||
gint arg_2,
|
||||
gpointer data2);
|
||||
register GMarshalFunc_VOID__BOXED_INT callback;
|
||||
register GCClosure *cc = (GCClosure*) closure;
|
||||
register gpointer data1, data2;
|
||||
|
||||
g_return_if_fail (n_param_values == 3);
|
||||
|
||||
if (G_CCLOSURE_SWAP_DATA (closure))
|
||||
{
|
||||
data1 = closure->data;
|
||||
data2 = g_value_peek_pointer (param_values + 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
data1 = g_value_peek_pointer (param_values + 0);
|
||||
data2 = closure->data;
|
||||
}
|
||||
callback = (GMarshalFunc_VOID__BOXED_INT) (marshal_data ? marshal_data : cc->callback);
|
||||
|
||||
callback (data1,
|
||||
g_marshal_value_peek_boxed (param_values + 1),
|
||||
g_marshal_value_peek_int (param_values + 2),
|
||||
data2);
|
||||
}
|
||||
|
||||
/* VOID:POINTER (./json-marshal.list:5) */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user