applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for installed MICO version, and the libs it requires by using

Browse source 
Wed Jun 10 11:34:52 1998  Owen Taylor  <otaylor@gtk.org>

	* configure.in acconfig.h: Check for installed MICO
	  version, and the libs it requires by using mico-ld
	  and mico-setup.sh.

	  Add a HAVE_MICO_ORB_RUN macro to signal that we need
	  to call orb->run(), as we do for mico-2.0.6 and later

Wed Jun 10 11:41:11 1998  Owen Taylor  <otaylor@gtk.org>

	* */Makefile.am: Use MICO_LIBS variable from
	  toplevel configure.in.

Wed Jun 10 11:42:16 1998  Owen Taylor  <otaylor@gtk.org>

	* Makefile.am: Use MICO_LIBS variable from
	  toplevel configure.in.

	* applet-lib.cc launcher-lib.cc mico-lib.cc. Call
	  orb->run() at appropriate times when HAVE_MICO_ORB_RUN
	  is defined.
This commit is contained in:
Owen Taylor 1998-06-10 15:48:25 +00:00 • committed by Owen Taylor
parent 0498c6eed4
commit b98a671b8b
3 changed files with 57 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Wed Jun 10 11:34:52 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acconfig.h: Check for installed MICO
version, and the libs it requires by using mico-ld
and mico-setup.sh.
Add a HAVE_MICO_ORB_RUN macro to signal that we need
to call orb->run(), as we do for mico-2.0.6 and later
Tue Jun 9 23:37:43 EDT 1998 Gregory McLean <gregm@comstar.net> Tue Jun 9 23:37:43 EDT 1998 Gregory McLean <gregm@comstar.net>
* .cvsignore updates. * .cvsignore updates.

6
acconfig.h
View file

@ -1,13 +1,15 @@
#undef ENABLE_NLS #undef ENABLE_NLS
#undef HAVE_CATGETS #undef HAVE_CATGETS
#undef HAVE_DEVGTK
#undef HAVE_GETTEXT #undef HAVE_GETTEXT
#undef HAVE_LC_MESSAGES #undef HAVE_LC_MESSAGES
#undef HAVE_STPCPY #undef HAVE_STPCPY
#undef HAVE_LIBSM #undef HAVE_LIBSM
#undef PACKAGE
#undef VERSION
#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
#undef HAVE_PROGRAM_INVOCATION_NAME #undef HAVE_PROGRAM_INVOCATION_NAME
#undef HAVE_MICO_ORB_RUN
#undef PACKAGE
#undef VERSION
/* Name of default window manager, as string. */ /* Name of default window manager, as string. */
#undef WINDOW_MANAGER #undef WINDOW_MANAGER

44
configure.in
View file

@ -50,6 +50,50 @@ dnl properties-keyboard
AC_CHECK_HEADERS(X11/extensions/xf86misc.h, XF86MISC_LIBS="-lXxf86misc") AC_CHECK_HEADERS(X11/extensions/xf86misc.h, XF86MISC_LIBS="-lXxf86misc")
AC_SUBST(XF86MISC_LIBS) AC_SUBST(XF86MISC_LIBS)
dnl MICO - Magic to extract the relevant information from
dnl various installed files
AC_MSG_CHECKING(for MICO prefix)
for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
if test -f $dir/mico-ld ; then
mico_prefix=`echo $dir | sed 's%/bin$%%'`
fi
done
if test ${mico_prefix+set} = set ; then
AC_MSG_RESULT($mico_prefix)
else
AC_MSG_RESULT(not found)
AC_MSG_ERROR(MICO not found)
fi
MICO_VERS=`(. $mico_prefix/lib/mico-setup.sh ; echo $MICOVERSION)`
# We assume here, to keep things simple, that nobody
# has MICO older than 2.0.5.
if test $MICO_VERS = 2.0.5 ; then
MICO_LIBS="-lmicoaux$MICO_VERS -lmico$MICO_VERS -lXt"
else
MICO_LIBS="-lmico$MICO_VERS -lmicogtk$MICO_VERS"
AC_DEFINE(HAVE_MICO_ORB_RUN)
fi
for flag in `grep ^eval < $mico_prefix/bin/mico-ld | sed s%\"%%` ; do
case $flag in
-L*)
MICO_LIBS="$flag $MICO_LIBS"
;;
-lm|-ldl|-ldld)
;;
-l*)
MICO_LIBS="$MICO_LIBS $flag"
;;
esac
done
AC_SUBST(MICO_LIBS)
AC_SUBST(MICO_VARS)
dnl gnome-session dnl gnome-session
dnl $GNOME_HAVE_SM comes from GNOME_X_CHECKS dnl $GNOME_HAVE_SM comes from GNOME_X_CHECKS
AM_CONDITIONAL(SESSION, test "$GNOME_HAVE_SM" = true) AM_CONDITIONAL(SESSION, test "$GNOME_HAVE_SM" = true)