changeset: 4476:781e065f28a76678ca3109b917ababef5150bd17 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Sun May 11 14:29:05 2008 +0200 files: ChangeLog.carbon2 configure description: Regenerate configure. I need to do this to build; this seems to be a merge artefact. diff -r 11515817d9ca86ee8caafb52872c0a0e7cd0705a -r 781e065f28a76678ca3109b917ababef5150bd17 ChangeLog.carbon2 --- a/ChangeLog.carbon2 Sun May 11 10:33:18 2008 +0200 +++ b/ChangeLog.carbon2 Sun May 11 14:29:05 2008 +0200 ＠＠ -1,4 +1,6 ＠＠ 2008-05-11 Aidan Kehoe <kehoea＠parhasa 2008-05-11 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * configure: Regenerate. * Makefile.in.in: Clean up a conditional after an automated merge had a non-easily-resolved conflict. diff -r 11515817d9ca86ee8caafb52872c0a0e7cd0705a -r 781e065f28a76678ca3109b917ababef5150bd17 configure --- a/configure Sun May 11 10:33:18 2008 +0200 +++ b/configure Sun May 11 14:29:05 2008 +0200 ＠＠ -40579,7 +40579,6 ＠＠ OBJECT_TO_BUILD!$OBJECT_TO_BUILD$ac_deli OBJECT_TO_BUILD!$OBJECT_TO_BUILD$ac_delim ldap_libs!$ldap_libs$ac_delim postgresql_libs!$postgresql_libs$ac_delim -lwlib_objs!$lwlib_objs$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ＠＠ -40621,6 +40620,7 ＠＠ ac_delim='%!_!# ' ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +lwlib_objs!$lwlib_objs$ac_delim canna_libs!$canna_libs$ac_delim ALLOCA!$ALLOCA$ac_delim have_esd_config!$have_esd_config$ac_delim ＠＠ -40698,7 +40698,7 ＠＠ LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches