mirror of
https://github.com/moparisthebest/hexchat
synced 2024-10-31 15:35:03 -04:00
Merge pull request #484 from Phr33d0m/master
A few fixes on the *nix build system
This commit is contained in:
commit
083710d8d3
31
configure.ac
31
configure.ac
@ -114,8 +114,8 @@ AC_ARG_ENABLE(xlib,
|
|||||||
xlib=$enableval, xlib=yes)
|
xlib=$enableval, xlib=yes)
|
||||||
|
|
||||||
AC_ARG_ENABLE(python,
|
AC_ARG_ENABLE(python,
|
||||||
[AS_HELP_STRING([--disable-python],[don't build the python plugin])],
|
[AS_HELP_STRING([--enable-python=pythonversion],[build the python plugin (default on, python2)])],
|
||||||
python=$enableval, python=yes)
|
python=$enableval, python=python2)
|
||||||
|
|
||||||
AC_ARG_ENABLE(perl,
|
AC_ARG_ENABLE(perl,
|
||||||
[AS_HELP_STRING([--disable-perl],[don't build the perl plugin])],
|
[AS_HELP_STRING([--disable-perl],[don't build the perl plugin])],
|
||||||
@ -199,14 +199,16 @@ dnl *********************************************************************
|
|||||||
dnl ** GTK **************************************************************
|
dnl ** GTK **************************************************************
|
||||||
dnl *********************************************************************
|
dnl *********************************************************************
|
||||||
|
|
||||||
AM_PATH_GTK_2_0(2.10.0, havegtk=yes, havegtk=no)
|
# we might get undefined macro without this test
|
||||||
|
if test "$gtkfe" = yes ; then
|
||||||
|
AM_PATH_GTK_2_0(2.10.0, havegtk=yes, havegtk=no)
|
||||||
|
|
||||||
if test "$havegtk" = no; then
|
if test "$havegtk" = no; then
|
||||||
gtkfe=no
|
gtkfe=no
|
||||||
echo
|
echo
|
||||||
echo Cannot find GTK\! Not building GTK FrontEnd.
|
echo Cannot find GTK\! Not building GTK FrontEnd.
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$gtkfe" != yes; then
|
if test "$gtkfe" != yes; then
|
||||||
gnome=no
|
gnome=no
|
||||||
@ -221,7 +223,6 @@ dnl *********************************************************************
|
|||||||
GUI_LIBS="$GUI_LIBS $GTK_LIBS"
|
GUI_LIBS="$GUI_LIBS $GTK_LIBS"
|
||||||
GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
|
GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
|
||||||
|
|
||||||
gnome=no
|
|
||||||
#if test "$gnome" = yes; then
|
#if test "$gnome" = yes; then
|
||||||
# AC_PATH_PROG(pkgconfigpath, pkg-config)
|
# AC_PATH_PROG(pkgconfigpath, pkg-config)
|
||||||
# AC_MSG_CHECKING(Gnome2 compile flags)
|
# AC_MSG_CHECKING(Gnome2 compile flags)
|
||||||
@ -239,7 +240,11 @@ gnome=no
|
|||||||
#fi
|
#fi
|
||||||
|
|
||||||
# GConf
|
# GConf
|
||||||
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
|
if test "$gnome" != no ; then
|
||||||
|
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
|
||||||
|
else
|
||||||
|
GCONFTOOL=no
|
||||||
|
fi
|
||||||
|
|
||||||
dnl *********************************************************************
|
dnl *********************************************************************
|
||||||
dnl ** XFT **************************************************************
|
dnl ** XFT **************************************************************
|
||||||
@ -328,8 +333,12 @@ dnl *********************************************************************
|
|||||||
dnl ** PYTHON ***********************************************************
|
dnl ** PYTHON ***********************************************************
|
||||||
dnl *********************************************************************
|
dnl *********************************************************************
|
||||||
|
|
||||||
if test "$python" = yes; then
|
if test "x$python" != xno ; then
|
||||||
AC_PATH_PROG(pythonpath, python2)
|
if test "$python" = yes ; then
|
||||||
|
# default
|
||||||
|
python="python2"
|
||||||
|
fi
|
||||||
|
AC_PATH_PROG(pythonpath, $python)
|
||||||
if test "_$pythonpath" = _ ; then
|
if test "_$pythonpath" = _ ; then
|
||||||
AC_PATH_PROG(pythonpath, python)
|
AC_PATH_PROG(pythonpath, python)
|
||||||
fi
|
fi
|
||||||
@ -358,7 +367,7 @@ if test "$python" = yes; then
|
|||||||
AC_MSG_RESULT([Can't find Python.h])
|
AC_MSG_RESULT([Can't find Python.h])
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Python too old. Only 2.2 or above is supported."
|
echo "Python is too old or too new. Only 2.2-2.7 are supported."
|
||||||
python=no
|
python=no
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -691,7 +700,7 @@ AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
|
|||||||
AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
|
AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
|
||||||
AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
|
AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
|
||||||
AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
|
AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
|
||||||
AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
|
AM_CONDITIONAL(DO_PYTHON, test "x$python" != "xno")
|
||||||
dnl AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
|
dnl AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
|
||||||
AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
|
AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
|
||||||
AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes")
|
AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes")
|
||||||
|
@ -1 +1,3 @@
|
|||||||
|
if DO_GTK
|
||||||
SUBDIRS = icons misc
|
SUBDIRS = icons misc
|
||||||
|
endif
|
||||||
|
@ -52,6 +52,10 @@ libhexchatcommon_a_LIBADD = \
|
|||||||
endif
|
endif
|
||||||
SUBDIRS = $(dbusdir) .
|
SUBDIRS = $(dbusdir) .
|
||||||
|
|
||||||
|
if DO_PLUGIN
|
||||||
|
include_HEADERS = hexchat-plugin.h
|
||||||
|
endif
|
||||||
|
|
||||||
libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
|
libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
|
||||||
history.c ignore.c inbound.c modes.c msproxy.c network.c notify.c \
|
history.c ignore.c inbound.c modes.c msproxy.c network.c notify.c \
|
||||||
outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \
|
outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \
|
||||||
|
Loading…
Reference in New Issue
Block a user