commit: AC_CHECK_LIB needs a function symbol. <87zls98qtk.fsf@uwakimon.sk.tsukuba.ac.jp>
16 years, 9 months
Stephen Turnbull
changeset: 4440:e4225b6d938918eaf9a1bb01c0d01afb1b672d90
tag: tip
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Fri Apr 04 10:48:58 2008 -0700
files: ChangeLog configure configure.ac
description:
AC_CHECK_LIB needs a function symbol. <87zls98qtk.fsf(a)uwakimon.sk.tsukuba.ac.jp>
diff -r f4eb31866c3830c131d730ed67c2aa8b462f80a9 -r e4225b6d938918eaf9a1bb01c0d01afb1b672d90 ChangeLog
--- a/ChangeLog Sat Mar 15 12:21:11 2008 +0100
+++ b/ChangeLog Fri Apr 04 10:48:58 2008 -0700
@@ -1,3 +1,15 @@ 2008-02-15 Marcus Crestani <crestani@x
+2008-04-01 Andreas Schwab <schwab(a)suse.de>
+
+ Thanks to Mike Fabian for posting a patch to the mainline, to Martin
+ Buchholz for writing the ChangeLog, and to Aidan Kehoe for finding
+ the 2003-01-27 ChangeLog. Tested against Xaw3d. -- stephen
+
+ * configure.ac (athena_3d):
+ AC_CHECK_LIB must always take a function as
+ argument, never a global variable. Some linkers can tell the
+ difference. So change:
+ threeDClassRec ==> XawSme3dComputeTopShadowRGB
+
2008-02-15 Marcus Crestani <crestani(a)xemacs.org>
* configure.ac: Look for all x86 machines to determine which write
diff -r f4eb31866c3830c131d730ed67c2aa8b462f80a9 -r e4225b6d938918eaf9a1bb01c0d01afb1b672d90 configure
--- a/configure Sat Mar 15 12:21:11 2008 +0100
+++ b/configure Fri Apr 04 10:48:58 2008 -0700
@@ -25701,9 +25701,9 @@ echo "${ECHO_T}$ac_res" >&6; }
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- as_ac_Lib=`echo "ac_cv_lib_$athena_variant''_threeDClassRec" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for threeDClassRec in -l$athena_variant" >&5
-echo $ECHO_N "checking for threeDClassRec in -l$athena_variant... $ECHO_C" >&6; }
+ as_ac_Lib=`echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
+echo $ECHO_N "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... $ECHO_C" >&6; }
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25722,11 +25722,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char threeDClassRec ();
+char XawSme3dComputeTopShadowRGB ();
int
main ()
{
-return threeDClassRec ();
+return XawSme3dComputeTopShadowRGB ();
;
return 0;
}
@@ -25778,9 +25778,9 @@ fi
fi
else
- as_ac_Lib=`echo "ac_cv_lib_$athena_variant''_threeDClassRec" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for threeDClassRec in -l$athena_variant" >&5
-echo $ECHO_N "checking for threeDClassRec in -l$athena_variant... $ECHO_C" >&6; }
+ as_ac_Lib=`echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
+echo $ECHO_N "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... $ECHO_C" >&6; }
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -25799,11 +25799,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char threeDClassRec ();
+char XawSme3dComputeTopShadowRGB ();
int
main ()
{
-return threeDClassRec ();
+return XawSme3dComputeTopShadowRGB ();
;
return 0;
}
@@ -25844,9 +25844,9 @@ if test `eval echo '${'$as_ac_Lib'}'` =
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
athena_lib=$athena_variant
else
- { echo "$as_me:$LINENO: checking for threeDClassRec in -lXaw" >&5
-echo $ECHO_N "checking for threeDClassRec in -lXaw... $ECHO_C" >&6; }
-if test "${ac_cv_lib_Xaw_threeDClassRec+set}" = set; then
+ { echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5
+echo $ECHO_N "checking for XawSme3dComputeTopShadowRGB in -lXaw... $ECHO_C" >&6; }
+if test "${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -25864,11 +25864,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
-char threeDClassRec ();
+char XawSme3dComputeTopShadowRGB ();
int
main ()
{
-return threeDClassRec ();
+return XawSme3dComputeTopShadowRGB ();
;
return 0;
}
@@ -25891,21 +25891,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_Xaw_threeDClassRec=yes
+ ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_Xaw_threeDClassRec=no
+ ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_threeDClassRec" >&5
-echo "${ECHO_T}$ac_cv_lib_Xaw_threeDClassRec" >&6; }
-if test $ac_cv_lib_Xaw_threeDClassRec = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&5
+echo "${ECHO_T}$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&6; }
+if test $ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB = yes; then
athena_lib=Xaw;
{ echo "$as_me:$LINENO: WARNING: Assuming that libXaw is actually $athena_variant." >&5
diff -r f4eb31866c3830c131d730ed67c2aa8b462f80a9 -r e4225b6d938918eaf9a1bb01c0d01afb1b672d90 configure.ac
--- a/configure.ac Sat Mar 15 12:21:11 2008 +0100
+++ b/configure.ac Fri Apr 04 10:48:58 2008 -0700
@@ -4241,17 +4241,17 @@ if test "$with_x11" = "yes" -a "$detect_
AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb,
[
dnl Must not be a 3d library...
- AC_CHECK_LIB($athena_variant, threeDClassRec,
+ AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB,
[AC_MSG_WARN([Could not find a non-3d Athena widget library.])],
athena_lib=$athena_variant)
],
AC_MSG_WARN([Could not find an Athena widget library.]))
else
dnl The real configuration, need 3d library
- AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant,
+ AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant,
dnl OK, couldn't find it with a proper name, try the standard Athena lib
dnl If that is 3d, presume the user asked for what they have installed.
- AC_CHECK_LIB(Xaw, threeDClassRec,
+ AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB,
[
athena_lib=Xaw;
AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Re: CVS update by michaelk packages/xemacs-packages/ediff, ediff-vers.el, ediff-ptch.el, ediff-init.el, ediff-diff.el ...
16 years, 9 months
Norbert Koch
* xemacs-cvs(a)xemacs.org:
Michael,
this breaks the build
> User: michaelk
> Date: 08/04/04 10:06:16
>
> Modified: packages/xemacs-packages/ediff ediff.el ediff-wind.el
> ediff-vers.el ediff-util.el ediff-tbar.el
> ediff-ptch.el ediff-mult.el ediff-merg.el
> ediff-init.el ediff-hook.el ediff-help.el
> ediff-diff.el ChangeLog
> Log:
> * ediff*el: replaced load with require in eval-when-compile.
>
> * ediff-hook: deleted all invocations of (autoload ...).
>
> * ediff-util.el (ediff-setup): make window-min-height a local variable
> in ediff control window, and set its min height to 2.
> (ediff-setup-control-buffer): dedicate the control window.
> (ediff-toggle-multiframe): undedicate control window.
> Work directly with ediff-setup-windows-multiframe and
> ediff-setup-windows-plain.
>
> * ediff-wind (ediff-choose-window-setup-function-automatically): new
> function.
> (ediff-window-setup-function): change initialization.
> (ediff-setup-windows-automatic): deleted.
> (ediff-setup-windows-plain-merge): make control window dedicated.
> (ediff-destroy-control-frame): do not skip frames if working in a
> single frame.
# bind (file)
batch-byte-compile-1("ediff-diff.el")
# bind (error file-to-process)
batch-byte-compile-one-file()
# bind (error)
batch-byte-compile()
# bind (arg)
command-line-do-funcall("-f")
# bind (dir file-count line end-of-options file-p arg tem)
command-line-1()
# bind (command-line-args-left)
command-line()
# (condition-case ... . ((t (byte-code " Â" ... 1))))
# bind (error-data)
normal-top-level()
# (condition-case ... . error)
# (catch top-level ...)
>>Error occurred processing ediff-diff.el:
Wrong number of arguments: require, 3
Done
make: *** [ediff-diff.elc] Error 1
Compilation exited abnormally with code 2 at Fri Apr 4 12:37:32
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
mark-defun bug
16 years, 9 months
Andreas Röhler
Hi all,
`mark-defun' misses the last char, if a definition is
followed by a buffer-end.
As this bug seems caused by a line not needed AFAIU, it's
probably fine to drop it.
Patch attached.
Thanks
Andreas Röhler
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches