aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

If glib sources are found from some subdirectory, always compile it and

Browse Source 
use it even if glib is already installed somewhere else.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@860 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-11-23 22:42:37 +00:00 committed by cras
parent 8ce36c05ea
commit 972c06ba17
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -11,7 +11,7 @@ if BUILD_SERVERTEST
SERVERTEST=servertest
endif
SUBDIRS = po intl src $(SERVERTEST) docs scripts
SUBDIRS = po intl $(GLIB_DIR) src $(SERVERTEST) docs scripts
confdir = $(sysconfdir)/irssi
conf_DATA = config colorless.theme split.theme

34
configure.in
View File

@ -226,9 +226,31 @@ dnl **
dnl ** fe-text checks
dnl **
AC_PATH_PROG(sedpath, sed)
AC_MSG_CHECKING([whether GLib is unpacked to irssi dir])
GLIB_DIR=`for d in *; do test -e $d/glib.h && echo $d; done`
if test "x$GLIB_DIR" != "x"; then
dnl glib in irssi directory, use it
AC_MSG_RESULT([yes, using it])
full_glib_dir="`pwd`/$GLIB_DIR"
GLIB_CFLAGS="-I$full_glib_dir"
GLIB_LIBS="$full_glib_dir/.libs/libglib.a $full_glib_dir/gmodule/.libs/libgmodule.a"
AC_SUBST(GLIB_DIR)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
else
AC_MSG_RESULT([no])
AM_PATH_GLIB(1.2.0,,, gmodule)
if test "x$GLIB_LIBS" = "x"; then
AC_ERROR([GLib is required to build irssi])
echo
echo "*** If you don't have GLIB, you can get it from ftp://ftp.gtk.org"
echo "*** If you can't install GLIB anywhere or if you don't want to,"
echo "*** you can just unpack it to Irssi's source directory and"
echo "*** Irssi will automatically compile and use it."
AC_ERROR([GLIB is required to build irssi.])
fi
fi
PROG_LIBS="$PROG_LIBS $GLIB_LIBS"
@ -271,7 +293,6 @@ else
has_curses=false
fi
AC_PATH_PROG(sedpath, sed)
if test "$want_perl" != "no"; then
AC_PATH_PROG(perlpath, perl)
AC_MSG_CHECKING(for Perl compile flags)
@ -521,6 +542,15 @@ if test "x$want_perl" != "xno"; then
fi
fi
if test "x$GLIB_DIR" != "x"; then
echo
echo "configuring GLib ..."
echo
cd $GLIB_DIR
./configure
cd ..
fi
echo
if test "x$curses_error" != "xyes"; then