Merge pull request #730 from hasufell/mono
BUILD: add --with-theme-manager configure option
This commit is contained in:
commit
012b9c478e
4
.gitignore
vendored
4
.gitignore
vendored
@ -44,7 +44,11 @@ src/common/textenums.h
|
|||||||
src/common/textevents.h
|
src/common/textevents.h
|
||||||
src/fe-gtk/hexchat
|
src/fe-gtk/hexchat
|
||||||
src/fe-text/hexchat-text
|
src/fe-text/hexchat-text
|
||||||
|
src/htm/Main.resources
|
||||||
src/htm/thememan.exe
|
src/htm/thememan.exe
|
||||||
|
src/htm/thememan.exe.config
|
||||||
|
src/htm/thememan.exe.mdb
|
||||||
|
src/htm/thememan
|
||||||
stamp-h1
|
stamp-h1
|
||||||
*.a
|
*.a
|
||||||
*.o
|
*.o
|
||||||
|
19
configure.ac
19
configure.ac
@ -21,6 +21,7 @@ AC_PROG_CPP
|
|||||||
AM_PROG_AS
|
AM_PROG_AS
|
||||||
AM_DISABLE_STATIC
|
AM_DISABLE_STATIC
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
|
AC_PATH_PROG(MDTOOL, mdtool, no)
|
||||||
|
|
||||||
dnl -----------------------------------------------------------
|
dnl -----------------------------------------------------------
|
||||||
dnl Language Support
|
dnl Language Support
|
||||||
@ -185,6 +186,20 @@ AC_ARG_ENABLE(minimal-flags,
|
|||||||
[AS_HELP_STRING([--enable-minimal-flags],[only add those CFLAGS that are really needed or not intrusive (default: no)])],
|
[AS_HELP_STRING([--enable-minimal-flags],[only add those CFLAGS that are really needed or not intrusive (default: no)])],
|
||||||
minimalflags=$enableval, minimalflags=no)
|
minimalflags=$enableval, minimalflags=no)
|
||||||
|
|
||||||
|
AC_ARG_WITH(theme-manager,
|
||||||
|
[AS_HELP_STRING([--with-theme-manager],[compile theme manager (needs monodevelop, default: off)])],
|
||||||
|
theme_manager=$withval, theme_manager=no)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
dnl *********************************************************************
|
||||||
|
dnl ** THEME-MANAGER ****************************************************
|
||||||
|
dnl *********************************************************************
|
||||||
|
if test "x$theme_manager" != "xno" ; then
|
||||||
|
if test "x$MDTOOL" = "xno"; then
|
||||||
|
AC_MSG_ERROR([No "mdtool" found, you need to install monodevelop!])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
dnl *********************************************************************
|
dnl *********************************************************************
|
||||||
@ -669,6 +684,7 @@ AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes")
|
|||||||
AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes")
|
AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes")
|
||||||
AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
|
AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
|
||||||
#AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
|
#AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
|
||||||
|
AM_CONDITIONAL(WITH_TM, test "x$theme_manager" != "xno")
|
||||||
|
|
||||||
dnl *********************************************************************
|
dnl *********************************************************************
|
||||||
dnl ** SOCKS5 ***********************************************************
|
dnl ** SOCKS5 ***********************************************************
|
||||||
@ -952,6 +968,8 @@ src/common/Makefile
|
|||||||
src/common/dbus/Makefile
|
src/common/dbus/Makefile
|
||||||
src/fe-text/Makefile
|
src/fe-text/Makefile
|
||||||
src/fe-gtk/Makefile
|
src/fe-gtk/Makefile
|
||||||
|
src/htm/Makefile
|
||||||
|
src/htm/thememan
|
||||||
src/pixmaps/Makefile
|
src/pixmaps/Makefile
|
||||||
plugins/Makefile
|
plugins/Makefile
|
||||||
plugins/python/Makefile
|
plugins/python/Makefile
|
||||||
@ -972,6 +990,7 @@ echo HexChat $VERSION
|
|||||||
echo
|
echo
|
||||||
echo GTK+ interface ........ : $gtkfe
|
echo GTK+ interface ........ : $gtkfe
|
||||||
echo Text interface ........ : $textfe
|
echo Text interface ........ : $textfe
|
||||||
|
echo Theme manager ......... : $theme_manager
|
||||||
echo
|
echo
|
||||||
echo MMX tinting ........... : $mmx
|
echo MMX tinting ........... : $mmx
|
||||||
echo XShm tinting .......... : $shm
|
echo XShm tinting .......... : $shm
|
||||||
|
@ -1,3 +1,19 @@
|
|||||||
util_DATA = hexchat.desktop
|
util_DATA = hexchat.desktop
|
||||||
utildir = $(datadir)/applications
|
utildir = $(datadir)/applications
|
||||||
|
|
||||||
|
if WITH_TM
|
||||||
|
util_DATA += htm.desktop
|
||||||
|
mime_DATA = htm-mime.xml
|
||||||
|
mimedir = $(datadir)/mime/packages
|
||||||
|
|
||||||
|
UPDATE_MIME_DATABASE = update-mime-database "$(datadir)/mime" || :
|
||||||
|
UPDATE_DESKTOP_DATABASE = update-desktop-database -q "$(datadir)/applications" || :
|
||||||
|
|
||||||
|
install-data-hook:
|
||||||
|
$(UPDATE_MIME_DATABASE);
|
||||||
|
$(UPDATE_DESKTOP_DATABASE);
|
||||||
|
|
||||||
|
uninstall-hook:
|
||||||
|
$(UPDATE_MIME_DATABASE);
|
||||||
|
$(UPDATE_DESKTOP_DATABASE);
|
||||||
|
endif
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=HexChat Theme Manager
|
Name=HexChat Theme Manager
|
||||||
Exec=mono /usr/bin/thememan %f
|
Exec=thememan %f
|
||||||
Icon=hexchat
|
Icon=hexchat
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
|
@ -12,3 +12,7 @@ gtk_fe = fe-gtk
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = pixmaps common $(gtk_fe) $(text_fe)
|
SUBDIRS = pixmaps common $(gtk_fe) $(text_fe)
|
||||||
|
|
||||||
|
if WITH_TM
|
||||||
|
SUBDIRS += htm
|
||||||
|
endif
|
||||||
|
12
src/htm/Makefile.am
Normal file
12
src/htm/Makefile.am
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
MDTOOL_OPTS = --verbose
|
||||||
|
|
||||||
|
theme_SCRIPTS = thememan.exe thememan
|
||||||
|
themedir = $(bindir)
|
||||||
|
|
||||||
|
thememan.exe: htm-mono.csproj
|
||||||
|
$(MDTOOL) $(MDTOOL_OPTS) build $<
|
||||||
|
|
||||||
|
clean-local:
|
||||||
|
rm -f thememan.exe thememan.exe.config thememan.exe.mdb thememan Main.resources
|
||||||
|
|
||||||
|
EXTRA_DIST = thememan.in
|
3
src/htm/thememan.in
Normal file
3
src/htm/thememan.in
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
exec_prefix="@exec_prefix@"
|
||||||
|
exec mono "@bindir@/thememan.exe" "$@"
|
Loading…
Reference in New Issue
Block a user