From: Francesco M. <fr...@us...> - 2007-02-27 19:05:10
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30765 Modified Files: configure Log Message: Mac build fixes Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** configure 3 Jan 2007 23:10:00 -0000 1.48 --- configure 27 Feb 2007 19:05:02 -0000 1.49 *************** *** 7381,7385 **** main () { ! wxGLContext dummy(NULL); ; return 0; --- 7381,7385 ---- main () { ! wxGLCanvas dummy(NULL); ; return 0; *************** *** 7760,7765 **** if test "x$SUNCXX" = "xyes"; then AR=$CXX - AROPTIONS="-xar -o" else if test -n "$ac_tool_prefix"; then --- 7760,7769 ---- if test "x$SUNCXX" = "xyes"; then AR=$CXX AROPTIONS="-xar -o" + + elif test "x$SGICC" = "xyes"; then + AR=$CXX + AROPTIONS="-ar -o" + else if test -n "$ac_tool_prefix"; then *************** *** 8410,8413 **** --- 8414,8421 ---- ldargs="-r -keep_private_externs -nostdlib" + if test "x${D}CXX" = "x"; then + CXX="c++" + fi + while test ${D}# -gt 0; do case ${D}1 in *************** *** 8423,8426 **** --- 8431,8440 ---- ;; + -arch|-isysroot) + # collect these options and values + ldargs="${D}{ldargs} ${D}1 ${D}2" + shift + ;; + -s|-Wl,*) # collect these load args *************** *** 8462,8468 **** # if test ${D}{verbose} = 1; then ! echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" fi ! c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o status=${D}? --- 8476,8482 ---- # if test ${D}{verbose} = 1; then ! echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" fi ! ${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o status=${D}? *************** *** 8473,8479 **** if test ${D}{status} = 0; then if test ${D}{verbose} = 1; then ! echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}" fi ! c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args} status=${D}? fi --- 8487,8493 ---- if test ${D}{status} = 0; then if test ${D}{verbose} = 1; then ! echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}" fi ! ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args} status=${D}? fi *************** *** 8489,8493 **** chmod +x shared-ld-sh ! SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" --- 8503,8507 ---- chmod +x shared-ld-sh ! SHARED_LD_MODULE_CC="\$(CXX) `pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" |