User: stephent Date: 05/11/26 17:33:19 Added: packages/unsupported/stephen/curl build.patch Log: Build infrastructure patch. Revision Changes Path 1.1 XEmacs/packages/unsupported/stephen/curl/build.patch Index: build.patch =================================================================== --- xft-integration/configure.ac Sun Nov 20 16:47:00 2005 +++ xemacs-git/configure.ac Thu Nov 24 00:09:47 2005 ＠＠ -833,6 +830,9 ＠＠ XE_MERGED_ARG([postgresql], AC_HELP_STRING([--with-postgresql],[Support the PostgreSQL RDBMS.]), [], []) +XE_MERGED_ARG([curl], + AC_HELP_STRING([--with-curl],[Support the libcurl API.]), + [], []) dnl XE_HELP_SUBSECTION([Mail options]) XE_KEYWORD_ARG([mail-locking], ＠＠ -3851,6 +3855,29 ＠＠ fi AC_SUBST(postgresql_libs) +dnl Configure libcurl +curl_libs='' +if test "$with_curl" = "yes"; then + AC_CHECKING([for cURL]) + AC_CHECK_PROG (have_curl_config, curl-config, yes, no) + if test "$have_curl_config" = "no"; then + with_curl=no + else + AC_DEFINE(HAVE_CURL) + XE_APPEND(`curl-config --cflags`, c_switch_site) + curl_libs=`curl-config --libs` + XE_APPEND(modules/curl, MAKE_SUBDIR) + need_modules_common=yes + if test "$enable_modules" = "yes"; then + XE_APPEND(modules/curl, INSTALL_ARCH_DEP_SUBDIR) + fi + fi + if test "$with_curl" != "yes"; then + XE_DIE([Cannot fulfil --with-curl, curl-config not found.]) + fi +fi +AC_SUBST(curl_libs) + dnl ---------------------- dnl Graphics libraries dnl ---------------------- ＠＠ -5376,7 +5386,7 ＠＠ if test "$enable_modules" = "yes"; then ld_libs_module= else - XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs $canna_libs) + XE_SPACE(ld_libs_module, $ldap_libs $postgresql_libs $canna_libs $curl_libs) fi XE_SPACE(CFLAGS, $CFLAGS) ＠＠ -5955,6 +5965,7 ＠＠ echo " - Using PostgreSQL header file: $libpq_fe_h_file" test "$with_postgresqlv7" = yes && echo " - Using PostgreSQL V7 bindings." fi +test "$with_curl" = yes && echo " Compiling in support for libcurl API." echo " Internationalization:" --- xft-integration/src/config.h.in Tue Nov 15 21:27:58 2005 +++ xemacs-git/src/config.h.in Mon Nov 21 00:55:33 2005 ＠＠ -539,6 +536,9 ＠＠ #undef HAVE_POSTGRESQLV7 /* main PostgreSQL header file */ #undef LIBPQ_FE_H_FILE + +/* Do we want libcurl support? */ +#undef HAVE_CURL /* Do you have the Xauth library present? This will add some extra functionality to gnuserv. */ --- xft-integration/src/Makefile.in.in Sun Nov 20 02:34:43 2005 +++ xemacs-git/src/Makefile.in.in Mon Nov 21 00:54:03 2005 ＠＠ -218,6 +218,10 ＠＠ postgresql_objs=$(BLDMODULES)/postgresql/postgresql.o #endif +#if defined(HAVE_CURL) && !defined(HAVE_SHLIB) +curl_objs=$(BLDMODULES)/curl/curl_api.o +#endif + #ifdef HAVE_WIN32_PROCESSES process_objs=process-nt.o #elif defined (HAVE_UNIX_PROCESSES) ＠＠ -269,7 +277,7 ＠＠ $(balloon_help_objs) blocktype.o buffer.o bytecode.o \ callint.o casefiddle.o casetab.o chartab.o \ $(clash_detection_objs) cmdloop.o cmds.o $(coding_system_objs) console.o \ - console-stream.o\ + console-stream.o $(curl_objs) \ data.o $(database_objs) $(debug_objs) device.o dired.o doc.o doprnt.o\ dynarr.o \ editfns.o elhash.o emacs.o emodules.o eval.o events.o\