diff options
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 0 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index 88f4235..5391006 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,29 +168,6 @@ CLEANFILES += moc_*.cpp ui_*.h EXTRA_DIST += pica-client/pica-client.desktop -if XDG_UTILS - -pica-client-install-icon: pica-client/picapica-icon-sit.png - xdg-icon-resource install --size 32 $< pica-client - xdg-icon-resource install --size 22 $< pica-client - xdg-icon-resource install --size 64 $< pica-client - -pica-client-install-menuitem: pica-client/pica-client.desktop - xdg-desktop-menu install $< - -install-data-hook: pica-client-install-icon pica-client-install-menuitem - -pica-client-uninstall-icon: - xdg-icon-resource uninstall --size 32 pica-client - xdg-icon-resource uninstall --size 22 pica-client - xdg-icon-resource uninstall --size 64 pica-client - -pica-client-uninstall-menuitem: - xdg-desktop-menu uninstall pica-client.desktop - -uninstall-hook: pica-client-uninstall-menuitem pica-client-uninstall-icon - -endif deploy: pica-client/pica-client mkdir -p PicaPicaMessenger.app/Contents/Resources diff --git a/configure.ac b/configure.ac index 88fd60f..2ad38c3 100644 --- a/configure.ac +++ b/configure.ac @@ -83,9 +83,6 @@ AS_IF([test "x$PICA_NODE_ENABLED" != "xyes" && test "x$PICA_CLIENT_ENABLED" != " AC_MSG_ERROR(["Either pica-node or pica-client must be enabled"]) ) -#check if installing menu item for pica-client is disabled -AC_ARG_ENABLE([menuitem], - AS_HELP_STRING([--disable-menuitem], [Disable pica-client menu item installation])) AM_CONDITIONAL([PICA_NODE], [test "x$PICA_NODE_ENABLED" = "xyes"]) AM_CONDITIONAL([PICA_CLIENT], [test "x$PICA_CLIENT_ENABLED" = "xyes"]) @@ -112,19 +109,12 @@ AC_CHECK_PROGS([MOC], [$QT_MOC_NAMES], [notfound]) AS_IF([test "x$UIC" = xnotfound],[AC_MSG_ERROR(["uic program not found. Please install Qt development package"])]) AS_IF([test "x$MOC" = xnotfound],[AC_MSG_ERROR(["moc program not found. Please install Qt development package"])]) -#check for xdg-utils -AS_IF([test "x$enable_menuitem" != "xno"], [ -AC_CHECK_PROG([XDG_DESKTOP_MENU], [xdg-desktop-menu], [yes], [no]) -AS_IF([test "x$XDG_DESKTOP_MENU" != xyes],[AC_MSG_WARN(["Looks like xdg-utils are not installed. Desktop menu item installation disabled"])]) -]) - #check for openssl command line tool AC_CHECK_PROG([OPENSSL_TOOL], [openssl], [yes], [no]) AS_IF([test "x$OPENSSL_TOOL" != xyes],[AC_MSG_WARN(["openssl command line tool not found. This is a runtime dependency for pica-client!"])]) ]) -AM_CONDITIONAL([XDG_UTILS], [test "x$XDG_DESKTOP_MENU" = "xyes"]) # Checks for header files. AC_CHECK_HEADERS([arpa/inet.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h]) |