mirror of
https://github.com/irssi/irssi.git
synced 2024-11-03 04:27:19 -05:00
"glib in irssi dir" fixes
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1020 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
a676bd8155
commit
64eed6e82b
21
configure.in
21
configure.in
@ -238,9 +238,19 @@ if test "x$GLIB_DIR" != "x"; then
|
|||||||
dnl glib in irssi directory, use it
|
dnl glib in irssi directory, use it
|
||||||
AC_MSG_RESULT([yes, using it])
|
AC_MSG_RESULT([yes, using it])
|
||||||
|
|
||||||
|
dnl * we have to do this at this point so we know what libs gmodule needs
|
||||||
|
echo
|
||||||
|
echo "configuring GLib ..."
|
||||||
|
echo
|
||||||
|
cd $GLIB_DIR
|
||||||
|
./configure
|
||||||
|
cd ..
|
||||||
|
echo
|
||||||
|
|
||||||
|
GLIB_LDEXTRA=`$GLIB_DIR/glib-config --libs gmodule|sed -e 's/-lglib//' -e 's/-lgmodule//' -e 's,-L/usr/local/lib ,,'|sed 's/ \+/ /g'`
|
||||||
full_glib_dir="`pwd`/$GLIB_DIR"
|
full_glib_dir="`pwd`/$GLIB_DIR"
|
||||||
GLIB_CFLAGS="-I$full_glib_dir -I$full_glib_dir/gmodule"
|
GLIB_CFLAGS="-I$full_glib_dir -I$full_glib_dir/gmodule"
|
||||||
GLIB_LIBS="$full_glib_dir/.libs/libglib.a $full_glib_dir/gmodule/.libs/libgmodule.a"
|
GLIB_LIBS="$full_glib_dir/.libs/libglib.a $full_glib_dir/gmodule/.libs/libgmodule.a $GLIB_LDEXTRA"
|
||||||
AC_SUBST(GLIB_DIR)
|
AC_SUBST(GLIB_DIR)
|
||||||
AC_SUBST(GLIB_CFLAGS)
|
AC_SUBST(GLIB_CFLAGS)
|
||||||
AC_SUBST(GLIB_LIBS)
|
AC_SUBST(GLIB_LIBS)
|
||||||
@ -546,15 +556,6 @@ if test "x$want_perl" != "xno"; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$GLIB_DIR" != "x"; then
|
|
||||||
echo
|
|
||||||
echo "configuring GLib ..."
|
|
||||||
echo
|
|
||||||
cd $GLIB_DIR
|
|
||||||
./configure
|
|
||||||
cd ..
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
|
||||||
if test "x$curses_error" != "xyes"; then
|
if test "x$curses_error" != "xyes"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user