From: Martin R. <ru...@us...> - 2010-04-28 23:31:38
|
Update of /cvsroot/foo/foo/libfoo/m4 In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9894 Modified Files: objc.m4 Log Message: back to previous state Index: objc.m4 =================================================================== RCS file: /cvsroot/foo/foo/libfoo/m4/objc.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** objc.m4 28 Apr 2010 23:06:35 -0000 1.3 --- objc.m4 28 Apr 2010 23:31:30 -0000 1.4 *************** *** 401,404 **** --- 401,407 ---- ########## End of GNU General Public License (GPL), version 2 ########## + # include this file conditionally + m4_ifdef([AC_LANG(Objective C)], [], [ + ## ----------------------- ## ## 1. Language selection. ## *************** *** 413,418 **** # -------------------- # OBJCFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! m4_ifndef([AC_LANG(Objective C)], ! [m4_define([AC_LANG(Objective C)], [ac_ext=m ac_cpp='$OBJCPP $CPPFLAGS' --- 416,420 ---- # -------------------- # OBJCFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ! m4_define([AC_LANG(Objective C)], [ac_ext=m ac_cpp='$OBJCPP $CPPFLAGS' *************** *** 420,424 **** ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&AS_MESSAGE_LOG_FD' ac_compiler_gnu=$ac_cv_objc_compiler_gnu ! ])]) --- 422,426 ---- ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&AS_MESSAGE_LOG_FD' ac_compiler_gnu=$ac_cv_objc_compiler_gnu ! ]) *************** *** 430,441 **** # _AC_LANG_ABBREV(Objective C) # ---------------------------- ! m4_ifndef([_AC_LANG_ABBREV(Objective C)], ! [m4_define([_AC_LANG_ABBREV(Objective C)], [objc])]) # _AC_LANG_PREFIX(Objective C) # ---------------------------- ! m4_ifndef([_AC_LANG_PREFIX(Objective C)], ! [m4_define([_AC_LANG_PREFIX(Objective C)], [OBJC])]) --- 432,441 ---- # _AC_LANG_ABBREV(Objective C) # ---------------------------- ! m4_define([_AC_LANG_ABBREV(Objective C)], [objc]) # _AC_LANG_PREFIX(Objective C) # ---------------------------- ! m4_define([_AC_LANG_PREFIX(Objective C)], [OBJC]) *************** *** 452,457 **** # AC_LANG_SOURCE(Objective C)(BODY) # --------------------------------- ! m4_ifndef([AC_LANG_SOURCE(Objective C)], ! [m4_copy([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])]) --- 452,456 ---- # AC_LANG_SOURCE(Objective C)(BODY) # --------------------------------- ! m4_copy([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)]) *************** *** 626,627 **** --- 625,628 ---- # libobjc and objc header tests shere? + + ]) # close conditional inclusion of objc macros |