From ba2bbc75e63b968d03da1094fcb8f28a1f734b39 Mon Sep 17 00:00:00 2001 From: Jan Lipovsky Date: Fri, 28 May 2010 13:59:28 +0200 Subject: Release --- configure.ac | 77 +++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 29 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 76a486b..4facb64 100755 --- a/configure.ac +++ b/configure.ac @@ -3,41 +3,62 @@ AC_PREREQ([2.63]) AC_INIT([Simple File Share], [0.1.0], [janlipovsky@gmail.com]) -AM_INIT_AUTOMAKE([Simple File Share], [0.1.0]) +# AM_INIT_AUTOMAKE([Simple File Share], [0.1.0]) +AM_INIT_AUTOMAKE([1.9 tar-ustar]) # Checks for programs. +AC_C_CONST +AC_ISC_POSIX AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +AM_PROG_LIBTOOL +AM_PROG_CC_C_O +AM_DISABLE_STATIC -PKG_CHECK_MODULES(GLIB, glib-2.0) -AC_SUBST([GLIB_CFLAGS]) -AC_SUBST([GLIB_LIBS]) -PKG_CHECK_MODULES(GTK, gtk+-2.0) -AC_SUBST([GTK_CFLAGS]) -AC_SUBST([GTK_LIBS]) +dnl Check for pkgconfig first +AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1) -AC_SUBST([DBUS_GLIB_CFLAGS]) -AC_SUBST([DBUS_GLIB_LIBS]) +dnl Give error and exit if we don't have pkgconfig +if test "x$HAVE_PKGCONFIG" = "xno"; then + AC_MSG_ERROR(you need to have pkgconfig installed !) +fi -PKG_CHECK_MODULES(POLKIT, polkit-gtk-1) -AC_SUBST([POLKIT_CFLAGS]) -AC_SUBST([POLKIT_LIBS]) -PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension) -AC_SUBST([NAUTILUS_CFLAGS]) -AC_SUBST([NAUTILUS_LIBS]) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.22.0) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) -#AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [], AC_MSG_ERROR([gtk+-2.0 is required for this program])) +PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.8) +AC_SUBST(DBUS_GLIB_CFLAGS) +AC_SUBST(DBUS_GLIB_LIBS) -#AC_CHECK_LIB(glib-2.0, g_string_new, [], AC_MSG_ERROR([glib-2.0 is required for this program])) +PKG_CHECK_MODULES(POLKIT, polkit-gtk-1 >= 0.96) +AC_SUBST(POLKIT_CFLAGS) +AC_SUBST(POLKIT_LIBS) -#AC_CHECK_LIB([nautilus-extension], [nautilus_file_info_get_file_type], [], AC_MSG_ERROR([libnautilus-extension is required for this program])) +PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= 2.24.0) +NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` +AC_SUBST(NAUTILUS_CFLAGS) +AC_SUBST(NAUTILUS_LIBS) +AC_SUBST(NAUTILUS_EXTENSION_DIR) -#AC_CHECK_LIB([dbus-glib-1], [dbus_g_proxy_call], [], AC_MSG_ERROR([dbus-glib-1 is required for this program])) -#AC_CHECK_LIB([polkit-gtk-1], [polkit_authority_check_authorization_finish], [], AC_MSG_ERROR([polkit-gtk-1 is required for this program])) +DISABLE_DEPRECATED_CFLAGS=" -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED" +AC_SUBST(DISABLE_DEPRECATED_CFLAGS) + +dnl WARN_CFLAGS="-Wall -Werror" +WARN_CFLAGS="-Wall" +AC_SUBST(WARN_CFLAGS) + # Checks for header files. AC_CHECK_HEADERS([stdlib.h string.h]) @@ -49,13 +70,11 @@ AC_C_INLINE AC_CHECK_FUNCS([strstr]) AC_CONFIG_FILES([Makefile - sfshare-daemon/Makefile - sfshare-daemon/src/Makefile - sfshare-daemon/data/Makefile - sfshare-gui/Makefile - sfshare-gui/src/Makefile - sfshare-gui/data/Makefile]) - -# nautilus-plugin/src/Makefile + sfshare-daemon/Makefile + sfshare-daemon/data/Makefile + sfshare-gui/Makefile + sfshare-gui/data/Makefile + nautilus-plugin/Makefile]) + AC_OUTPUT -- cgit