[Pkg-privacy-commits] [nautilus-wipe] 82/224: Build system update and cleanup

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch master
in repository nautilus-wipe.

commit 88cca00e27529782e384d64c0f93fd297a22ff3e
Author: Colomban Wendling <ban at herbesfolles.org>
Date:   Tue Mar 30 18:20:20 2010 +0200

    Build system update and cleanup
    
    Changes summary:
     * We now require autoconf >= 2.64 (no change), automake >= 1.11.1
       and libtool >= 2.2.6;
     * Checks for libraries are now done one by one allowing fine tuning;
     * Useless checks are gone.
---
 TODO                     |  2 --
 configure.ac             | 46 ++++++++++++++++++----------------------------
 nautilus-srm/Makefile.am | 21 ++++++++++++++++++---
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/TODO b/TODO
index 62045a3..3376d47 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 * Perhaps cleanup a bit progress dialog, it is currently overkill
 
-* Cleanup configure script
-
 * Add our entries in the same section on the context's menu that
   the "Delete" and the "Move to trash" entry
   -> I don't think it's possible
diff --git a/configure.ac b/configure.ac
index 45da97b..da4c48a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,21 +1,20 @@
-# Based on NautilusActions configure & build system, some things copied from it.
+# Initially based on NautilusActions configure & build system.
 
-
-AC_PREREQ(2.64)
+AC_PREREQ([2.64])
 AC_INIT([nautilus-srm],[0.1])
 AC_CONFIG_SRCDIR([nautilus-srm/nautilus-srm.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([-Wall -Werror])
+AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror])
 AC_CONFIG_HEADERS([config.h])
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
 # Checks for programs.
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 AC_PROG_CC
-# ?
-AM_DISABLE_STATIC
-AM_PROG_LIBTOOL
+AM_PROG_CC_C_O
 
 # Checks for libraries.
 # 2.6 for gtk_message_dialog_format_secondary_text()
@@ -30,40 +29,30 @@ GOBJECT_REQUIRED=2.4.0
 GCONF_REQUIRED=2.0
 NAUTILUS_EXTENSION=2.0
 GSECUREDELETE_REQUIRED=0.1
-
-PKG_CHECK_MODULES([NAUTILUS_SRM], \
-  glib-2.0              >= ${GLIB_REQUIRED}           \
-  gtk+-2.0              >= ${GTK_REQUIRED}            \
-  gconf-2.0             >= ${GCONF_REQUIRED}          \
-  libnautilus-extension >= ${NAUTILUS_EXTENSION}      \
-  gsecuredelete         >= ${GSECUREDELETE_REQUIRED}  \
-)
-
 GIO_UNIX_REQUIRED=2.0
 
+# mandatory packages
+PKG_CHECK_MODULES([GLIB],                   glib-2.0              >= ${GLIB_REQUIRED})
+PKG_CHECK_MODULES([GTK],                    gtk+-2.0              >= ${GTK_REQUIRED})
+PKG_CHECK_MODULES([GCONF],                  gconf-2.0             >= ${GCONF_REQUIRED})
+PKG_CHECK_MODULES([LIBNAUTILUS_EXTENSION],  libnautilus-extension >= ${NAUTILUS_EXTENSION})
+PKG_CHECK_MODULES([GSECUREDELETE],          gsecuredelete         >= ${GSECUREDELETE_REQUIRED})
+
+# optional packages
 HAVE_GIO_UNIX=0
 PKG_CHECK_MODULES([GIO_UNIX], gio-unix-2.0 >= ${GIO_UNIX_REQUIRED},
                   [ HAVE_GIO_UNIX=1
                     AC_SUBST([GIO_UNIX_CFLAGS])
                     AC_SUBST([GIO_UNIX_LIBS]) ],
-                  [ echo "	$GIO_UNIX_PKG_ERRORS">&2 ])
+                  [ AC_MSG_WARN([GIO-UNIX not found. Some UNIX mount points might not be detected correctly. The error was: ${GIO_UNIX_PKG_ERRORS}])])
 AC_DEFINE_UNQUOTED([HAVE_GIO_UNIX], [${HAVE_GIO_UNIX}], [Whether we have gio-unix])
 
-AC_SUBST([NAUTILUS_SRM_CFLAGS])
-AC_SUBST([NAUTILUS_SRM_LIBS])
-AC_SUBST([AM_CFLAGS],["${AM_CFLAGS} ${NAUTILUS_SRM_CFLAGS} ${GIO_UNIX_CFLAGS}"])
-AC_SUBST([AM_LIBS],["${AM_LIBS} ${NAUTILUS_SRM_LIBS} ${GIO_UNIX_LIBS}"])
-
 # i18n
 AM_GNU_GETTEXT([external])
 
 # Checks for header files.
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-
-# Log domain
-AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} -DG_LOG_DOMAIN=\\\"${PACKAGE}\\\""])
 
 # when working in a test environment, nautilus is typically installed in
 # a non-standard location ; lets specify this here
@@ -76,6 +65,7 @@ AC_CHECK_LIB([nautilus-extension], [nautilus_menu_provider_get_file_items])
 AC_CHECK_FUNCS([nautilus_file_info_get_location])
 
 # Output
-AC_CONFIG_FILES([Makefile po/Makefile.in
+AC_CONFIG_FILES([Makefile
+                 po/Makefile.in
                  nautilus-srm/Makefile])
 AC_OUTPUT
diff --git a/nautilus-srm/Makefile.am b/nautilus-srm/Makefile.am
index 0ae0650..4968dd4 100644
--- a/nautilus-srm/Makefile.am
+++ b/nautilus-srm/Makefile.am
@@ -15,10 +15,25 @@ libnautilus_srm_la_SOURCES = nautilus-srm.c \
                              progress-dialog.c \
                              progress-dialog.h \
                              compat.h
+libnautilus_srm_la_CPPFLAGS = -DG_LOG_DOMAIN=\"$(PACKAGE)\"
+libnautilus_srm_la_CFLAGS   = @GLIB_CFLAGS@ \
+                              @GTK_CFLAGS@ \
+                              @GCONF_CFLAGS@ \
+                              @LIBNAUTILUS_EXTENSION_CFLAGS@ \
+                              @GSECUREDELETE_CFLAGS@ \
+                              @GIO_UNIX_CFLAGS@
+libnautilus_srm_la_LDFLAGS  = -module -avoid-version \
+                              @GLIB_LIBS@ \
+                              @GTK_LIBS@ \
+                              @GCONF_LIBS@ \
+                              @LIBNAUTILUS_EXTENSION_LIBS@ \
+                              @GSECUREDELETE_LIBS@ \
+                              @GIO_UNIX_LIBS@
 
-libnautilus_srm_la_LDFLAGS = $(AM_LIBS) -module -avoid-version
-
-test_LDFLAGS = $(AM_LIBS)
+test_CFLAGS  = @GLIB_CFLAGS@ \
+               @GTK_CFLAGS@
+test_LDFLAGS = @GLIB_LIBS@ \
+               @GTK_LIBS@
 # Linking against a loadable module is not portable according to libtool.
 # However, I don't really care about portability issue here because it is only a
 # test program (that might even be removed at a time).

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/nautilus-wipe.git