diff options
| -rw-r--r-- | macros/gnome-objc-checks.m4 | 19 | ||||
| -rw-r--r-- | macros/gnome.m4 | 3 |
2 files changed, 6 insertions, 16 deletions
diff --git a/macros/gnome-objc-checks.m4 b/macros/gnome-objc-checks.m4 index 603909e3f8..96f0aa4bb5 100644 --- a/macros/gnome-objc-checks.m4 +++ b/macros/gnome-objc-checks.m4 @@ -1,18 +1,10 @@ AC_DEFUN([GNOME_CHECK_OBJC], [ - dnl Look for an ObjC compiler. - dnl FIXME: extend list of possible names of ObjC compilers. +dnl Look for an ObjC compiler. +dnl FIXME: extend list of possible names of ObjC compilers. AC_CHECK_PROGS(OBJC, $OBJC gcc, "") - dnl See if it works - dnl FIXME: I don't know ObjC. I took hints from *.m files - dnl already in the gnome tree. But this one compiles, and looks - dnl for pthread libs, when linked. (Raja Harinath) - dnl The ObjC library, with threads enabled, uses sched_yield, which, - dnl on Solaris is in -lposix4. For now, I just put -lposix4 into - dnl PTHREAD_LIB: it is as good a place as any. Maybe there should - dnl be an OBJC_LIBS. oLIBS=$LIBS LIBS="$LIBS $PTHREAD_LIB" AC_CHECK_FUNC(sched_yield,,[ @@ -37,10 +29,8 @@ AC_DEFUN([GNOME_CHECK_OBJC], [[myid free]]; return 0; } - EOF - dnl FIXME: internal autoconf knowledge here. Really we should copy - dnl autoconf's C++ support for ObjC. (Tom Tromey) + $OBJC -o conftest $LDFLAGS conftest.m -lobjc $PTHREAD_LIB 1>&AC_FD_CC 2>&1 result=$? rm -f conftest* @@ -51,8 +41,7 @@ AC_DEFUN([GNOME_CHECK_OBJC], else ac_cv_prog_objc_works=no fi - dnl End of AC_CACHE_CHECK ]) AM_CONDITIONAL(OBJECTIVE_C, test x$ac_cv_prog_objc_works = xyes) -]) +])
\ No newline at end of file diff --git a/macros/gnome.m4 b/macros/gnome.m4 index 92d97cfae7..a28520650e 100644 --- a/macros/gnome.m4 +++ b/macros/gnome.m4 @@ -32,9 +32,10 @@ AC_DEFUN([GNOME_INIT], ]) + AC_MSG_CHECKING(Loading gnomeConf.sh values) if test -e $gnome_prefix/gnomeConf.sh; then - AC_MSG_CHECKING(Loading gnomeConf.sh values) . $gnome_prefix/gnomeConf.sh + AC_MSG_RESULT(found) else AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) fi |