From 2c33b48a6af94e403d5c550bcc0586f29a397d03 Mon Sep 17 00:00:00 2001 From: lins05 Date: Sat, 9 Apr 2011 17:33:28 +0800 Subject: [PATCH] modify configur.ac to support optional compiling of demo program and pysearpc --- .gitignore | 2 +- AUTHORS | 5 +- Makefile.am | 3 ++ Makefile.in | 44 +++++++++------- News => NEWS | 0 README.markdown | 2 +- configure.ac | 41 ++++++++++++--- m4/python.m4 | 66 +++++++++++++++++++++++ pysearpc/Makefile.am | 13 ++--- pysearpc/Makefile.in | 122 +++++++++++++++++++++---------------------- tests/Makefile.in | 7 +-- 11 files changed, 206 insertions(+), 99 deletions(-) rename News => NEWS (100%) create mode 100644 m4/python.m4 diff --git a/.gitignore b/.gitignore index 2df5175..7975458 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ config.* autom4te.cache/* aclocal.m4 -m4/* configure.status configure.sub configure @@ -23,3 +22,4 @@ stamp-h1 searpc-demo-server searpc-demo-client pysearpc/fcallfret.h +m4/l* diff --git a/AUTHORS b/AUTHORS index 990f54d..ce56f1b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,4 @@ -plt +Lintao Pan +Zheng Liu +Lingjun Li +Shuai Lin diff --git a/Makefile.am b/Makefile.am index f8b1243..63b3641 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ AM_CFLAGS = @GLIB2_CFLAGS@ @GOBJECT_CFLAGS@ \ -I$(top_builddir)/include \ @JSON_GLIB_CFLAGS@ + +if COMPILE_DEMO noinst_PROGRAMS = searpc-demo-server searpc-demo-client searpc_demo_server_SOURCES = searpc-demo-server.c searpc-demo-packet.h @@ -17,6 +19,7 @@ searpc_demo_server_LDADD = ./libsearpc.la searpc_demo_client_SOURCES = searpc-demo-client.c searpc-demo-packet.h searpc_demo_client_LDADD = ./libsearpc.la +endif # we need to generate the headers first BUILT_SOURCES = genrpc diff --git a/Makefile.in b/Makefile.in index c20f551..1f07dd4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,19 +36,19 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = searpc-demo-server$(EXEEXT) \ - searpc-demo-client$(EXEEXT) +@COMPILE_DEMO_TRUE@noinst_PROGRAMS = searpc-demo-server$(EXEEXT) \ +@COMPILE_DEMO_TRUE@ searpc-demo-client$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ - COPYING.LESSER ChangeLog INSTALL config.guess config.sub \ + COPYING.LESSER ChangeLog INSTALL NEWS config.guess config.sub \ depcomp install-sh ltmain.sh missing py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -87,12 +87,18 @@ libsearpc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libsearpc_la_LDFLAGS) $(LDFLAGS) -o $@ PROGRAMS = $(noinst_PROGRAMS) -am_searpc_demo_client_OBJECTS = searpc-demo-client.$(OBJEXT) +am__searpc_demo_client_SOURCES_DIST = searpc-demo-client.c \ + searpc-demo-packet.h +@COMPILE_DEMO_TRUE@am_searpc_demo_client_OBJECTS = \ +@COMPILE_DEMO_TRUE@ searpc-demo-client.$(OBJEXT) searpc_demo_client_OBJECTS = $(am_searpc_demo_client_OBJECTS) -searpc_demo_client_DEPENDENCIES = ./libsearpc.la -am_searpc_demo_server_OBJECTS = searpc-demo-server.$(OBJEXT) +@COMPILE_DEMO_TRUE@searpc_demo_client_DEPENDENCIES = ./libsearpc.la +am__searpc_demo_server_SOURCES_DIST = searpc-demo-server.c \ + searpc-demo-packet.h +@COMPILE_DEMO_TRUE@am_searpc_demo_server_OBJECTS = \ +@COMPILE_DEMO_TRUE@ searpc-demo-server.$(OBJEXT) searpc_demo_server_OBJECTS = $(am_searpc_demo_server_OBJECTS) -searpc_demo_server_DEPENDENCIES = ./libsearpc.la +@COMPILE_DEMO_TRUE@searpc_demo_server_DEPENDENCIES = ./libsearpc.la DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -108,8 +114,9 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libsearpc_la_SOURCES) $(searpc_demo_client_SOURCES) \ $(searpc_demo_server_SOURCES) -DIST_SOURCES = $(libsearpc_la_SOURCES) $(searpc_demo_client_SOURCES) \ - $(searpc_demo_server_SOURCES) +DIST_SOURCES = $(libsearpc_la_SOURCES) \ + $(am__searpc_demo_client_SOURCES_DIST) \ + $(am__searpc_demo_server_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -228,6 +235,7 @@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ @@ -302,10 +310,10 @@ AM_CFLAGS = @GLIB2_CFLAGS@ @GOBJECT_CFLAGS@ \ -I$(top_builddir)/include \ @JSON_GLIB_CFLAGS@ -searpc_demo_server_SOURCES = searpc-demo-server.c searpc-demo-packet.h -searpc_demo_server_LDADD = ./libsearpc.la -searpc_demo_client_SOURCES = searpc-demo-client.c searpc-demo-packet.h -searpc_demo_client_LDADD = ./libsearpc.la +@COMPILE_DEMO_TRUE@searpc_demo_server_SOURCES = searpc-demo-server.c searpc-demo-packet.h +@COMPILE_DEMO_TRUE@searpc_demo_server_LDADD = ./libsearpc.la +@COMPILE_DEMO_TRUE@searpc_demo_client_SOURCES = searpc-demo-client.c searpc-demo-packet.h +@COMPILE_DEMO_TRUE@searpc_demo_client_LDADD = ./libsearpc.la # we need to generate the headers first BUILT_SOURCES = genrpc @@ -327,15 +335,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/News b/NEWS similarity index 100% rename from News rename to NEWS diff --git a/README.markdown b/README.markdown index 34886d6..99d02e3 100644 --- a/README.markdown +++ b/README.markdown @@ -234,7 +234,7 @@ The following packages are required to build libsearpc: * glib-2.0 >= 2.16.0 * gobject-2.0 >= 2.16.0 * json-glib-1.0 >= 0.10.2 -* pygobject-2.0 >= 2.0 +* pygobject-2.0 >= 2.0 (if you choose to build pysearpc) License diff --git a/configure.ac b/configure.ac index ce9f716..81f4cc1 100644 --- a/configure.ac +++ b/configure.ac @@ -12,8 +12,8 @@ AM_INIT_AUTOMAKE([1.9]) # Checks for programs. AC_PROG_CC AC_PROG_LIBTOOL -AM_PATH_PYTHON([2.4]) -# Checks for libraries. + + # Checks for header files. AC_CHECK_HEADERS([arpa/inet.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) @@ -27,29 +27,58 @@ AC_TYPE_UINT16_T # Checks for library functions. AC_CHECK_FUNCS([memset socket strerror strndup]) +# Options about demos and pysearpc + +# option: compile-demo +AC_ARG_ENABLE([compile-demo], +[AS_HELP_STRING([--compile-demo], +[compile demo programs @<:@default: yes@:>@])], +[compile_demo=${enableval}], [compile_demo=yes]) + +AM_CONDITIONAL([COMPILE_DEMO], [test x${compile_demo} = xyes]) + +# option: compile-python +AC_ARG_ENABLE([compile-python], +[AS_HELP_STRING([--compile-python], +[compile python programs @<:@default: yes@:>@])], +[compile_python=${enableval}], [compile_python=yes]) + +AM_CONDITIONAL([COMPILE_PYTHON], [test x${compile_demo} = xyes]) + +# Checks for libraries. -# glib and json-glib GLIB_REQUIRED=2.16.0 JSON_GLIB_REQUIRED=0.10.2 PYGOBJECT_REQUIRED=2.0 +# check and subst glib PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED]) AC_SUBST(GLIB2_CFLAGS) AC_SUBST(GLIB2_LIBS) +# check and subst gobject PKG_CHECK_MODULES(GOBJECT, [gobject-2.0 >= $GLIB_REQUIRED]) AC_SUBST(GOBJECT_CFLAGS) AC_SUBST(GOBJECT_LIBS) +# check and subst json-glib PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0 >= $JSON_GLIB_REQUIRED]) AC_SUBST(JSON_GLIB_CFLAGS) AC_SUBST(JSON_GLIB_LIBS) -PKG_CHECK_MODULES(PYGOBJECT, [pygobject-2.0 >= $PYGOBJECT_REQUIRED]) -AC_SUBST(PYGOBJECT_CFLAGS) -AC_SUBST(PYGOBJECT_LIBS) +# conditinally check python and subst +if test x${compile_python} = xyes; then + AM_PATH_PYTHON([2.4]) + AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) + PKG_CHECK_MODULES(PYGOBJECT, [pygobject-2.0 >= $PYGOBJECT_REQUIRED]) + AC_SUBST(PYGOBJECT_CFLAGS) + AC_SUBST(PYGOBJECT_LIBS) +fi + AC_CONFIG_FILES([Makefile pysearpc/Makefile tests/Makefile]) AC_OUTPUT + + diff --git a/m4/python.m4 b/m4/python.m4 new file mode 100644 index 0000000..fe90156 --- /dev/null +++ b/m4/python.m4 @@ -0,0 +1,66 @@ +## this one is commonly used with AM_PATH_PYTHONDIR ... +dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) +dnl Check if a module containing a given symbol is visible to python. +AC_DEFUN([AM_CHECK_PYMOD], +[AC_REQUIRE([AM_PATH_PYTHON]) +py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) +AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ +ifelse([$2],[], [prog=" +import sys +try: + import $1 +except ImportError: + sys.exit(1) +except: + sys.exit(0) +sys.exit(0)"], [prog=" +import $1 +$1.$2"]) +if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC + then + eval "py_cv_mod_$py_mod_var=yes" + else + eval "py_cv_mod_$py_mod_var=no" + fi +]) +py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` +if test "x$py_val" != xno; then + AC_MSG_RESULT(yes) + ifelse([$3], [],, [$3 +])dnl +else + AC_MSG_RESULT(no) + ifelse([$4], [],, [$4 +])dnl +fi +]) + +dnl a macro to check for ability to create python extensions +dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) +dnl function also defines PYTHON_INCLUDES +AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +[AC_REQUIRE([AM_PATH_PYTHON]) +AC_MSG_CHECKING(for headers required to compile python extensions) +dnl deduce PYTHON_INCLUDES +py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +if test -x "$PYTHON-config"; then +PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` +else +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +fi +fi +AC_SUBST(PYTHON_INCLUDES) +dnl check if the headers exist: +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +AC_TRY_CPP([#include ],dnl +[AC_MSG_RESULT(found) +$1],dnl +[AC_MSG_RESULT(not found) +$2]) +CPPFLAGS="$save_CPPFLAGS" +]) diff --git a/pysearpc/Makefile.am b/pysearpc/Makefile.am index 657c335..30fd1c0 100644 --- a/pysearpc/Makefile.am +++ b/pysearpc/Makefile.am @@ -8,19 +8,16 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \ @PYGOBJECT_CFLAGS@ \ -I/usr/include/python$(PYTHON_VERSION) -# define the destination to install pysearpc files -pysearpcdir=${pyexecdir}/pysearpc - -pysearpc_PYTHON = __init__.py client.py gen-dfun-macro.py +if COMPILE_PYTHON +pkgpyexec_PYTHON = __init__.py client.py gen-dfun-macro.py # generating the fcallfret module -pysearpc_LTLIBRARIES = fcallfret.la +pkgpyexec_LTLIBRARIES = fcallfret.la fcallfret_la_LDFLAGS = -module -avoid-version -export-symbols-regex initfcallfret fcallfret_la_SOURCES = fcallfret.c fcallfret.h -fcallfret_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ \ - $(top_builddir)/libsearpc.la - +fcallfret_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ $(top_builddir)/libsearpc.la +endif CLEANFILES = fcallfret.h fcallfret.c: gen-dfun-macro.py diff --git a/pysearpc/Makefile.in b/pysearpc/Makefile.in index aea327c..65bbcff 100644 --- a/pysearpc/Makefile.in +++ b/pysearpc/Makefile.in @@ -35,13 +35,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = pysearpc -DIST_COMMON = $(pysearpc_PYTHON) $(srcdir)/Makefile.am \ +DIST_COMMON = $(am__pkgpyexec_PYTHON_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -69,15 +69,18 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pysearpcdir)" \ - "$(DESTDIR)$(pysearpcdir)" -LTLIBRARIES = $(pysearpc_LTLIBRARIES) -fcallfret_la_DEPENDENCIES = $(top_builddir)/libsearpc.la -am_fcallfret_la_OBJECTS = fcallfret.lo +am__installdirs = "$(DESTDIR)$(pkgpyexecdir)" \ + "$(DESTDIR)$(pkgpyexecdir)" +LTLIBRARIES = $(pkgpyexec_LTLIBRARIES) +@COMPILE_PYTHON_TRUE@fcallfret_la_DEPENDENCIES = \ +@COMPILE_PYTHON_TRUE@ $(top_builddir)/libsearpc.la +am__fcallfret_la_SOURCES_DIST = fcallfret.c fcallfret.h +@COMPILE_PYTHON_TRUE@am_fcallfret_la_OBJECTS = fcallfret.lo fcallfret_la_OBJECTS = $(am_fcallfret_la_OBJECTS) fcallfret_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(fcallfret_la_LDFLAGS) $(LDFLAGS) -o $@ +@COMPILE_PYTHON_TRUE@am_fcallfret_la_rpath = -rpath $(pkgpyexecdir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -92,7 +95,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(fcallfret_la_SOURCES) -DIST_SOURCES = $(fcallfret_la_SOURCES) +DIST_SOURCES = $(am__fcallfret_la_SOURCES_DIST) +am__pkgpyexec_PYTHON_DIST = __init__.py client.py gen-dfun-macro.py py_compile = $(top_srcdir)/py-compile ETAGS = etags CTAGS = ctags @@ -163,6 +167,7 @@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ @@ -237,18 +242,13 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \ @PYGOBJECT_CFLAGS@ \ -I/usr/include/python$(PYTHON_VERSION) - -# define the destination to install pysearpc files -pysearpcdir = ${pyexecdir}/pysearpc -pysearpc_PYTHON = __init__.py client.py gen-dfun-macro.py +@COMPILE_PYTHON_TRUE@pkgpyexec_PYTHON = __init__.py client.py gen-dfun-macro.py # generating the fcallfret module -pysearpc_LTLIBRARIES = fcallfret.la -fcallfret_la_LDFLAGS = -module -avoid-version -export-symbols-regex initfcallfret -fcallfret_la_SOURCES = fcallfret.c fcallfret.h -fcallfret_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ \ - $(top_builddir)/libsearpc.la - +@COMPILE_PYTHON_TRUE@pkgpyexec_LTLIBRARIES = fcallfret.la +@COMPILE_PYTHON_TRUE@fcallfret_la_LDFLAGS = -module -avoid-version -export-symbols-regex initfcallfret +@COMPILE_PYTHON_TRUE@fcallfret_la_SOURCES = fcallfret.c fcallfret.h +@COMPILE_PYTHON_TRUE@fcallfret_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ $(top_builddir)/libsearpc.la CLEANFILES = fcallfret.h all: all-am @@ -263,9 +263,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pysearpc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pysearpc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign pysearpc/Makefile + $(AUTOMAKE) --gnu pysearpc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -284,39 +284,39 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-pysearpcLTLIBRARIES: $(pysearpc_LTLIBRARIES) +install-pkgpyexecLTLIBRARIES: $(pkgpyexec_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(pysearpcdir)" || $(MKDIR_P) "$(DESTDIR)$(pysearpcdir)" - @list='$(pysearpc_LTLIBRARIES)'; test -n "$(pysearpcdir)" || list=; \ + test -z "$(pkgpyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgpyexecdir)" + @list='$(pkgpyexec_LTLIBRARIES)'; test -n "$(pkgpyexecdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ list2="$$list2 $$p"; \ else :; fi; \ done; \ test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pysearpcdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pysearpcdir)"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkgpyexecdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkgpyexecdir)"; \ } -uninstall-pysearpcLTLIBRARIES: +uninstall-pkgpyexecLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(pysearpc_LTLIBRARIES)'; test -n "$(pysearpcdir)" || list=; \ + @list='$(pkgpyexec_LTLIBRARIES)'; test -n "$(pkgpyexecdir)" || list=; \ for p in $$list; do \ $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pysearpcdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pysearpcdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgpyexecdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkgpyexecdir)/$$f"; \ done -clean-pysearpcLTLIBRARIES: - -test -z "$(pysearpc_LTLIBRARIES)" || rm -f $(pysearpc_LTLIBRARIES) - @list='$(pysearpc_LTLIBRARIES)'; for p in $$list; do \ +clean-pkgpyexecLTLIBRARIES: + -test -z "$(pkgpyexec_LTLIBRARIES)" || rm -f $(pkgpyexec_LTLIBRARIES) + @list='$(pkgpyexec_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done fcallfret.la: $(fcallfret_la_OBJECTS) $(fcallfret_la_DEPENDENCIES) - $(fcallfret_la_LINK) -rpath $(pysearpcdir) $(fcallfret_la_OBJECTS) $(fcallfret_la_LIBADD) $(LIBS) + $(fcallfret_la_LINK) $(am_fcallfret_la_rpath) $(fcallfret_la_OBJECTS) $(fcallfret_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -352,10 +352,10 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-pysearpcPYTHON: $(pysearpc_PYTHON) +install-pkgpyexecPYTHON: $(pkgpyexec_PYTHON) @$(NORMAL_INSTALL) - test -z "$(pysearpcdir)" || $(MKDIR_P) "$(DESTDIR)$(pysearpcdir)" - @list='$(pysearpc_PYTHON)'; dlist=; list2=; test -n "$(pysearpcdir)" || list=; \ + test -z "$(pkgpyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgpyexecdir)" + @list='$(pkgpyexec_PYTHON)'; dlist=; list2=; test -n "$(pkgpyexecdir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ @@ -366,30 +366,30 @@ install-pysearpcPYTHON: $(pysearpc_PYTHON) done; \ for file in $$list2; do echo $$file; done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pysearpcdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pysearpcdir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgpyexecdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgpyexecdir)" || exit $$?; \ done || exit $$?; \ if test -n "$$dlist"; then \ if test -z "$(DESTDIR)"; then \ - PYTHON=$(PYTHON) $(py_compile) --basedir "$(pysearpcdir)" $$dlist; \ + PYTHON=$(PYTHON) $(py_compile) --basedir "$(pkgpyexecdir)" $$dlist; \ else \ - PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pysearpcdir)" $$dlist; \ + PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pkgpyexecdir)" $$dlist; \ fi; \ else :; fi -uninstall-pysearpcPYTHON: +uninstall-pkgpyexecPYTHON: @$(NORMAL_UNINSTALL) - @list='$(pysearpc_PYTHON)'; test -n "$(pysearpcdir)" || list=; \ + @list='$(pkgpyexec_PYTHON)'; test -n "$(pkgpyexecdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ filesc=`echo "$$files" | sed 's|$$|c|'`; \ fileso=`echo "$$files" | sed 's|$$|o|'`; \ - echo " ( cd '$(DESTDIR)$(pysearpcdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pysearpcdir)" && rm -f $$files || exit $$?; \ - echo " ( cd '$(DESTDIR)$(pysearpcdir)' && rm -f" $$filesc ")"; \ - cd "$(DESTDIR)$(pysearpcdir)" && rm -f $$filesc || exit $$?; \ - echo " ( cd '$(DESTDIR)$(pysearpcdir)' && rm -f" $$fileso ")"; \ - cd "$(DESTDIR)$(pysearpcdir)" && rm -f $$fileso + echo " ( cd '$(DESTDIR)$(pkgpyexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgpyexecdir)" && rm -f $$files || exit $$?; \ + echo " ( cd '$(DESTDIR)$(pkgpyexecdir)' && rm -f" $$filesc ")"; \ + cd "$(DESTDIR)$(pkgpyexecdir)" && rm -f $$filesc || exit $$?; \ + echo " ( cd '$(DESTDIR)$(pkgpyexecdir)' && rm -f" $$fileso ")"; \ + cd "$(DESTDIR)$(pkgpyexecdir)" && rm -f $$fileso ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -477,7 +477,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(pysearpcdir)" "$(DESTDIR)$(pysearpcdir)"; do \ + for dir in "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(pkgpyexecdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -508,7 +508,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-pysearpcLTLIBRARIES \ +clean-am: clean-generic clean-libtool clean-pkgpyexecLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -529,13 +529,13 @@ info: info-am info-am: -install-data-am: install-pysearpcLTLIBRARIES install-pysearpcPYTHON +install-data-am: install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-pkgpyexecLTLIBRARIES install-pkgpyexecPYTHON install-html: install-html-am @@ -575,24 +575,24 @@ ps: ps-am ps-am: -uninstall-am: uninstall-pysearpcLTLIBRARIES uninstall-pysearpcPYTHON +uninstall-am: uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pysearpcLTLIBRARIES ctags distclean \ + clean-libtool clean-pkgpyexecLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-pysearpcLTLIBRARIES install-pysearpcPYTHON \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-pysearpcLTLIBRARIES uninstall-pysearpcPYTHON + install-pdf install-pdf-am install-pkgpyexecLTLIBRARIES \ + install-pkgpyexecPYTHON install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pkgpyexecLTLIBRARIES \ + uninstall-pkgpyexecPYTHON fcallfret.c: gen-dfun-macro.py diff --git a/tests/Makefile.in b/tests/Makefile.in index 7271eec..1071ca3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -41,7 +41,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -140,6 +140,7 @@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ @@ -227,9 +228,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign tests/Makefile + $(AUTOMAKE) --gnu tests/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \