mirror of
https://github.com/irssi/irssi.git
synced 2024-09-01 04:14:16 -04:00
Update to latest revision.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4328 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
bdbfada744
commit
69fd38c179
11
glib-2.0.m4_
11
glib-2.0.m4_
@ -5,7 +5,7 @@ dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [
|
|||||||
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
|
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
|
||||||
dnl gthread is specified in MODULES, pass to pkg-config
|
dnl gthread is specified in MODULES, pass to pkg-config
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN(AM_PATH_GLIB_2_0,
|
AC_DEFUN([AM_PATH_GLIB_2_0],
|
||||||
[dnl
|
[dnl
|
||||||
dnl Get the cflags and libraries from pkg-config
|
dnl Get the cflags and libraries from pkg-config
|
||||||
dnl
|
dnl
|
||||||
@ -19,6 +19,9 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
|
|||||||
gmodule)
|
gmodule)
|
||||||
pkg_config_args="$pkg_config_args gmodule-2.0"
|
pkg_config_args="$pkg_config_args gmodule-2.0"
|
||||||
;;
|
;;
|
||||||
|
gmodule-no-export)
|
||||||
|
pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
|
||||||
|
;;
|
||||||
gobject)
|
gobject)
|
||||||
pkg_config_args="$pkg_config_args gobject-2.0"
|
pkg_config_args="$pkg_config_args gobject-2.0"
|
||||||
;;
|
;;
|
||||||
@ -173,6 +176,8 @@ main ()
|
|||||||
:
|
:
|
||||||
else
|
else
|
||||||
echo "*** Could not run GLIB test program, checking why..."
|
echo "*** Could not run GLIB test program, checking why..."
|
||||||
|
ac_save_CFLAGS="$CFLAGS"
|
||||||
|
ac_save_LIBS="$LIBS"
|
||||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||||
LIBS="$LIBS $GLIB_LIBS"
|
LIBS="$LIBS $GLIB_LIBS"
|
||||||
AC_TRY_LINK([
|
AC_TRY_LINK([
|
||||||
@ -189,9 +194,7 @@ main ()
|
|||||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
|
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
|
||||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||||
echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
|
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
|
||||||
echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
|
|
||||||
echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
CFLAGS="$ac_save_CFLAGS"
|
||||||
LIBS="$ac_save_LIBS"
|
LIBS="$ac_save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user