| --- |
| configure.ac | 51 ++++++++++++--------------------------------------- |
| po/POTFILES.in | 2 +- |
| src/Makefile.am | 5 +++-- |
| 3 files changed, 16 insertions(+), 42 deletions(-) |
| |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -4,7 +4,7 @@ |
| dnl (Process this file with autoconf to produce a configure script.) |
| AC_REVISION($Revision: 1.1 $)dnl |
| |
| -AC_INIT(gnome-photo-printer,0.7.0,sv@fogman.de,gpp) |
| +AC_INIT(gnome-photo-printer, 0.7.0, sv@fogman.de, gpp) |
| AC_PREREQ(2.57) |
| AC_CONFIG_SRCDIR(src/gpp.c) |
| AM_CONFIG_HEADER(config.h) |
| @@ -16,52 +16,25 @@ |
| |
| IT_PROG_INTLTOOL([0.35.0]) |
| |
| -AC_PATH_PROG(PKGCONFIG, pkg-config, no) |
| -if test "$PKGCONFIG" = no ; then |
| - AC_MSG_ERROR(pkg-config was not found. Please install version 0.6.0 or newer from http://www.freedesktop.org/software.) |
| -fi |
| +PKG_PROG_PKG_CONFIG([0.16.0]) |
| |
| -AC_MSG_CHECKING(for pkg-config >= 0.6.0) |
| -vers=`$PKGCONFIG --version | awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 1000 + $3}'` |
| -if test "$vers" -ge 6000; then |
| - AC_MSG_RESULT(found) |
| -else |
| - AC_MSG_ERROR(You need at least pkg-config 0.6.0 or greater for this version of gnome-photo-printer. Please install a newer version from http://www.freedesktop.org/software.) |
| -fi |
| +PKG_CHECK_MODULES(GNOME, [ |
| + libgnomeui-2.0 |
| + libglade-2.0 |
| + libgnomeprint-2.2 |
| + libgnomeprintui-2.2 |
| + gnome-vfs-module-2.0 |
| + gmodule-2.0 |
| +]) |
| |
| -gnome_modules="\ |
| - libgnomeui-2.0 \ |
| - libglade-2.0 \ |
| - libgnomeprint-2.2 \ |
| - libgnomeprintui-2.2 \ |
| - gnome-vfs-module-2.0 \ |
| - gmodule-2.0 \ |
| -" |
| - |
| -for module in $gnome_modules |
| -do |
| - AC_MSG_CHECKING(for $module) |
| - if $PKGCONFIG --exists $module; then |
| - AC_MSG_RESULT(found) |
| - else |
| - AC_MSG_ERROR(You need to have $module installed to compile & run this software.) |
| - fi |
| -done |
| - |
| -EXTRA_GNOME_CFLAGS=`pkg-config --cflags $gnome_modules` |
| -EXTRA_GNOME_LIBS=`pkg-config --libs $gnome_modules` |
| - |
| -CFLAGS="$CFLAGS $EXTRA_GNOME_CFLAGS -g -O0 -Wall" |
| -LDFLAGS="$LDFLAGS $EXTRA_GNOME_LIBS" |
| +AC_SUBST(GNOME_CFLAGS) |
| +AC_SUBST(GNOME_LIBS) |
| |
| dnl These should be $pkgdatadir & pkglibdir, but that would make the |
| dnl last part 'gpp' rather thann 'gnome-photo-printer' |
| GPP_DATADIR=$datadir/gnome-photo-printer |
| GPP_LIBDIR=$libdir/gnome-photo-printer |
| |
| -AC_SUBST(CFLAGS) |
| -AC_SUBST(CPPFLAGS) |
| -AC_SUBST(LDFLAGS) |
| AC_SUBST(GPP_DATADIR) |
| AC_SUBST(GPP_LIBDIR) |
| |
| --- a/src/Makefile.am |
| +++ b/src/Makefile.am |
| @@ -2,7 +2,8 @@ |
| -DSYSCONFDIR=\"$(sysconfdir)\" \ |
| -DDATADIR=\"@GPP_DATADIR@\" \ |
| -DLOCALDIR=\"$(localdir)\" \ |
| - -DLIBDIR=\"@GPP_LIBDIR@\" |
| + -DLIBDIR=\"@GPP_LIBDIR@\" \ |
| + $(GNOME_CFLAGS) |
| |
| bin_PROGRAMS = gnome-photo-printer |
| |
| @@ -14,4 +15,4 @@ |
| gpp_print.c gpp_print.h \ |
| gpp_widget.c gpp_widget.h |
| |
| -gnome_photo_printer_LDADD = |
| +gnome_photo_printer_LDADD = $(GNOME_LIBS) |
| --- a/po/POTFILES.in |
| +++ b/po/POTFILES.in |
| @@ -3,4 +3,4 @@ |
| src/gpp_callbacks.c |
| src/gpp_functions.c |
| src/gpp_print.c |
| -glade/gpp.glade |
| +data/glade/gpp.glade |