Warn if some of the applets will not be built.
* configure.in: Warn if some of the applets will not be built.
This commit is contained in:
parent
9857929bbd
commit
a5db568baa
2 changed files with 20 additions and 12 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
1998-09-27 Raja R Harinath <harinath@cs.umn.edu>
|
||||||
|
|
||||||
|
* configure.in: Warn if some of the applets will not be built.
|
||||||
|
|
||||||
1998-09-24 Nuno Ferreira <nmrf@rnl.ist.utl.pt>
|
1998-09-24 Nuno Ferreira <nmrf@rnl.ist.utl.pt>
|
||||||
|
|
||||||
* applets/asclock/asclock_applet.desktop: Likewise.
|
* applets/asclock/asclock_applet.desktop: Likewise.
|
||||||
|
|
28
configure.in
28
configure.in
|
@ -28,7 +28,6 @@ GNOME_COMPILE_WARNINGS
|
||||||
GNOME_X_CHECKS
|
GNOME_X_CHECKS
|
||||||
GNOME_GHTTP_CHECK
|
GNOME_GHTTP_CHECK
|
||||||
|
|
||||||
|
|
||||||
dnl utility conditional
|
dnl utility conditional
|
||||||
AM_CONDITIONAL(FALSE, test "x" = "y")
|
AM_CONDITIONAL(FALSE, test "x" = "y")
|
||||||
|
|
||||||
|
@ -41,7 +40,6 @@ AC_SUBST(CFLAGS)
|
||||||
AC_SUBST(CPPFLAGS)
|
AC_SUBST(CPPFLAGS)
|
||||||
AC_SUBST(LDFLAGS)
|
AC_SUBST(LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS(dlfcn.h dl.h)
|
AC_CHECK_HEADERS(dlfcn.h dl.h)
|
||||||
AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl",[
|
AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl",[
|
||||||
AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld",[
|
AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld",[
|
||||||
|
@ -94,6 +92,9 @@ GNOME_INIT_LIBGTOP
|
||||||
dnl Check for ghttp library
|
dnl Check for ghttp library
|
||||||
AM_CONDITIONAL(HAVE_LIBGHTTP, test -n "$GHTTP_LIB")
|
AM_CONDITIONAL(HAVE_LIBGHTTP, test -n "$GHTTP_LIB")
|
||||||
AC_SUBST(GHTTP_LIB)
|
AC_SUBST(GHTTP_LIB)
|
||||||
|
if test -z "$GHTTP_LIB"; then
|
||||||
|
AC_MSG_WARN([*** \`bussign' applet will not be built ***])
|
||||||
|
fi
|
||||||
|
|
||||||
dnl panel/cdplayer
|
dnl panel/cdplayer
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
@ -103,30 +104,36 @@ case "$host" in
|
||||||
esac
|
esac
|
||||||
AM_CONDITIONAL(APPLET_CDPLAYER, test -n "$CDROM_HOST")
|
AM_CONDITIONAL(APPLET_CDPLAYER, test -n "$CDROM_HOST")
|
||||||
AC_SUBST(CDROM_HOST)
|
AC_SUBST(CDROM_HOST)
|
||||||
|
if test -z "$CDROM_HOST"; then
|
||||||
|
AC_MSG_WARN([*** \`cdplayer' applet will not be built ***])
|
||||||
|
fi
|
||||||
|
|
||||||
dnl panel/mixer
|
dnl panel/mixer
|
||||||
P_MIXER=
|
P_MIXER=
|
||||||
AC_CHECK_HEADERS(linux/soundcard.h,[P_MIXER=mixer],[
|
AC_CHECK_HEADERS(linux/soundcard.h,[P_MIXER=mixer],[
|
||||||
AC_CHECK_HEADERS(machine/soundcard.h, [P_MIXER=mixer])])
|
AC_CHECK_HEADERS(machine/soundcard.h, [P_MIXER=mixer])])
|
||||||
AM_CONDITIONAL(APPLET_MIXER, test "$P_MIXER" = "mixer")
|
AM_CONDITIONAL(APPLET_MIXER, test "$P_MIXER" = "mixer")
|
||||||
|
if test "$P_MIXER" != "mixer"; then
|
||||||
|
AC_MSG_WARN([*** \`mixer' applet will not be built ***])
|
||||||
|
fi
|
||||||
|
|
||||||
dnl panel/modemlights
|
dnl panel/modemlights
|
||||||
P_MODEMLIGHTS=
|
P_MODEMLIGHTS=
|
||||||
AC_CHECK_HEADERS(net/ppp_defs.h,[P_MODEMLIGHTS=modemlights])
|
AC_CHECK_HEADERS(net/ppp_defs.h,[P_MODEMLIGHTS=modemlights])
|
||||||
AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "$P_MODEMLIGHTS" = "modemlights")
|
AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "$P_MODEMLIGHTS" = "modemlights")
|
||||||
|
if test "$P_MODEMLIGHTS" != "modemlights"; then
|
||||||
|
AC_MSG_WARN([*** \`modemlights' applet will not be built ***])
|
||||||
|
fi
|
||||||
|
|
||||||
dnl fvwm-pager
|
dnl fvwm-pager
|
||||||
dnl we need the fvwm sources to build it
|
dnl we need the fvwm sources to build it
|
||||||
AC_ARG_WITH(fvwm2,
|
AC_ARG_WITH(fvwm2,
|
||||||
[ --with-fvwm2=DIRECTORY
|
[ --with-fvwm2=DIRECTORY top level dir of fvwm2 with libs and includes],
|
||||||
top level dir of fvwm2 with libs and includes], [
|
[FVWM_PAGER="fvwm-pager"], [FVWM_PAGER=""])
|
||||||
FVWM_PAGER="fvwm-pager"], [
|
|
||||||
FVWM_PAGER=""])
|
|
||||||
|
|
||||||
AM_CONDITIONAL(APPLET_FVWM_PAGER, test ! -z ${FVWM_PAGER})
|
AM_CONDITIONAL(APPLET_FVWM_PAGER, test ! -z "$FVWM_PAGER")
|
||||||
if test ! -z $FVWM_PAGER
|
if test ! -z "$FVWM_PAGER"
|
||||||
then
|
then
|
||||||
|
|
||||||
for x_dir in /usr/local/src/fvwm2 /usr/local/src/fvwm-2.0.46 /disk/compiles/fvwm-2.0.46 ${with_fvwm2}
|
for x_dir in /usr/local/src/fvwm2 /usr/local/src/fvwm-2.0.46 /disk/compiles/fvwm-2.0.46 ${with_fvwm2}
|
||||||
do
|
do
|
||||||
AC_MSG_CHECKING("for fvwm include files in ${x_dir}")
|
AC_MSG_CHECKING("for fvwm include files in ${x_dir}")
|
||||||
|
@ -154,9 +161,6 @@ then
|
||||||
AC_SUBST(FVWM2LIBS)
|
AC_SUBST(FVWM2LIBS)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(FVWM_PAGER)
|
|
||||||
|
|
||||||
|
|
||||||
dnl help-browser
|
dnl help-browser
|
||||||
dnl I found `inet_aton' in -lresolv on solaris
|
dnl I found `inet_aton' in -lresolv on solaris
|
||||||
oLIBS="$LIBS"
|
oLIBS="$LIBS"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue