callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add `gnome-pthread-check.m4'. New file. Moved pthread check from

Browse Source 
* Makefile.am (MACROS): Add `gnome-pthread-check.m4'.
* gnome-pthread-check.m4: New file.  Moved pthread check from
gnome-x-checks.m4 to here.
* gnome-objc-checks.m4: Use `gnome-pthread-check'.
(OBJC_LIBS): New config var.
* gnome-x-checks.m4: Add `AC_DEFINE(HAVE_LIBSM)' if `-lSM' is
already part of `$x_libs'.
Move pthread check to new file.

- Hari

svn path=/trunk/; revision=37
This commit is contained in:
Raja R Harinath
1998-02-15 23:13:49 +00:00
parent eaaef2717d
commit 75b3098560
5 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
macros/ChangeLog
View File

@ -1,3 +1,14 @@
1998-02-15 Raja R Harinath <harinath@cs.umn.edu>
* Makefile.am (MACROS): Add `gnome-pthread-check.m4'.
* gnome-pthread-check.m4: New file. Moved pthread check from
gnome-x-checks.m4 to here.
* gnome-objc-checks.m4: Use `gnome-pthread-check'.
(OBJC_LIBS): New config var.
* gnome-x-checks.m4: Add `AC_DEFINE(HAVE_LIBSM)' if `-lSM' is
already part of `$x_libs'.
Move pthread check to new file.
Sat Feb 14 12:45:35 1998 Tom Tromey <tromey@cygnus.com> Sat Feb 14 12:45:35 1998 Tom Tromey <tromey@cygnus.com>
* Makefile.am (macros.dep): Use single quotes, not double quotes. * Makefile.am (macros.dep): Use single quotes, not double quotes.

2
macros/Makefile.am
View File

@ -1,7 +1,7 @@
## Please update this variable if any new macros are created ## Please update this variable if any new macros are created
MACROS= aclocal-include.m4 gnome-guile-checks.m4 \ MACROS= aclocal-include.m4 gnome-guile-checks.m4 \
gnome-objc-checks.m4 gnome-x-checks.m4 \ gnome-objc-checks.m4 gnome-x-checks.m4 \
gnome-support.m4 gnome.m4 gnome-support.m4 gnome-pthread-check.m4 gnome.m4
EXTRA_DIST=$(MACROS) autogen.sh macros.dep EXTRA_DIST=$(MACROS) autogen.sh macros.dep
MAINTAINERCLEANFILES=macros.dep MAINTAINERCLEANFILES=macros.dep

13
macros/gnome-objc-checks.m4
View File

@ -4,12 +4,13 @@ dnl Look for an ObjC compiler.
dnl FIXME: extend list of possible names of ObjC compilers. dnl FIXME: extend list of possible names of ObjC compilers.
AC_CHECK_PROGS(OBJC, $OBJC gcc, "") AC_CHECK_PROGS(OBJC, $OBJC gcc, "")
oLIBS=$LIBS AC_REQUIRE([GNOME_PTHREAD_CHECK])
LIBS="$LIBS $PTHREAD_LIB"
AC_SUBST(PTHREAD_LIB) OBJC_LIBS="-lobjc $PTHREAD_LIB"
AC_CHECK_FUNC(sched_yield,,[ AC_CHECK_FUNC(sched_yield,,[
AC_CHECK_LIB(posix4,sched_yield,PTHREAD_LIB="$PTHREAD_LIB -lposix4")]) AC_CHECK_LIB(posix4,sched_yield,
LIBS=$oLIBS OBJC_LIBS="$OBJC_LIBS -lposix4",, $OBJC_LIBS)])
AC_SUBST(OBJC_LIBS)
AC_CACHE_CHECK([if Objective C compiler ($OBJC) works], AC_CACHE_CHECK([if Objective C compiler ($OBJC) works],
ac_cv_prog_objc_works, [ ac_cv_prog_objc_works, [
@ -31,7 +32,7 @@ int main () {
} }
EOF EOF
$OBJC -o conftest $LDFLAGS conftest.m -lobjc $PTHREAD_LIB 1>&AC_FD_CC 2>&1 $OBJC -o conftest $LDFLAGS conftest.m $OBJC_LIBS 1>&AC_FD_CC 2>&1
result=$? result=$?
rm -f conftest* rm -f conftest*

7
macros/gnome-pthread-check.m4 Normal file
View File

@ -0,0 +1,7 @@
AC_DEFUN([GNOME_PTHREAD_CHECK],[
PTHREAD_LIB=""
AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
[AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r")])
AC_SUBST(PTHREAD_LIB)
AC_PROVIDE([GNOME_PTHREAD_CHECK])
])

6
macros/gnome-x-checks.m4
View File

@ -32,6 +32,7 @@ AC_DEFUN([GNOME_X_CHECKS],
case "$x_libs" in case "$x_libs" in
*-lSM*) *-lSM*)
# Already found it. # Already found it.
AC_DEFINE(HAVE_LIBSM)
;; ;;
*) *)
AC_CHECK_LIB(SM, SmcSaveYourselfDone, AC_CHECK_LIB(SM, SmcSaveYourselfDone,
@ -55,10 +56,7 @@ AC_DEFUN([GNOME_X_CHECKS],
AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs) AC_CHECK_LIB(Xpm, XpmFreeXpmImage, [XPM_LIBS="-lXpm"], , $x_libs)
AC_SUBST(XPM_LIBS) AC_SUBST(XPM_LIBS)
PTHREAD_LIB="" AC_REQUIRE([GNOME_PTHREAD_CHECK])
AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
[AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r")])
AC_SUBST(PTHREAD_LIB)
CFLAGS="$saved_cflags $X_CFLAGS" CFLAGS="$saved_cflags $X_CFLAGS"
LDFLAGS="$saved_ldflags" LDFLAGS="$saved_ldflags"