changeset: 4440:e4225b6d938918eaf9a1bb01c0d01afb1b672d90 tag: tip user: Stephen J. Turnbull <stephen(a)xemacs.org&gt; 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&gt; 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&gt; + + 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&gt; * 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