Permalink
Browse files

Changes on the Autoshit configurations.

  • Loading branch information...
1 parent c616d2a commit ed1f2edfeccbd62d081491ac9405d07757d9519c @dnohales committed Jan 14, 2012
Showing with 54 additions and 16 deletions.
  1. +21 −4 autogen.sh
  2. +33 −12 configure.ac
View
@@ -1,9 +1,26 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
-PKG_NAME="gablabel"
+olddir=`pwd`
+cd $srcdir
-. gnome-autogen.sh
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+ echo "*** No autoreconf found, please intall it ***"
+ exit 1
+fi
+
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+ echo "*** No intltoolize found, please install the intltool package ***"
+ exit 1
+fi
+
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+
+cd $olddir
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
View
@@ -1,44 +1,65 @@
-AC_INIT([gablabel], [0.1.0], [damiannohales@gmail.com], [gablabel])
+AC_PREREQ([2.64])
+
+# Initialization
+AC_INIT([Gablabel],
+ [0.1.0],
+ [damiannohales@gmail.com],
+ [gablabel])
+
AC_CONFIG_SRCDIR([src/Makefile.am])
-AC_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([dist-bzip2])
-AM_MAINTAINER_MODE
+AC_CONFIG_HEADERS(config.h)
+AM_MAINTAINER_MODE([enable])
+# Check for programs
AC_PROG_CC
-AM_PROG_CC_C_O
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AM_PROG_VALAC([0.10.0])
AC_PATH_PROG(VALAC, valac, valac)
AC_SUBST(VALAC)
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext])
GETTEXT_PACKAGE=gablabel
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
AM_GLIB_GNU_GETTEXT
IT_PROG_INTLTOOL([0.35.0])
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
-GLIB_REQUIRED=2.12.0
-GTK_REQUIRED=2.18.0
-WEBKIT_REQUIRED=1.3.0
+GLIB_REQUIRED_VERSION=2.12.0
+GTK_REQUIRED_VERSION=2.18.0
+WEBKIT_REQUIRED_VERSION=1.3.0
-PKG_CHECK_MODULES(GABLABEL, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED webkit-1.0 >= $WEBKIT_REQUIRED)
+PKG_CHECK_MODULES(GABLABEL, [
+ gtk+-3.0 >= $GTK_REQUIRED_VERSION
+ gthread-2.0 >= $GLIB_REQUIRED_VERSION
+ glib-2.0 >= $GLIB_REQUIRED_VERSION
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gmodule-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
+ gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ webkit-1.0 >= $WEBKIT_REQUIRED_VERSION
+])
AC_SUBST(GABLABEL_CFLAGS)
AC_SUBST(GABLABEL_LIBS)
VALA_PACKAGES="--pkg webkit-1.0 "
AC_SUBST(VALA_PACKAGES)
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([
+ Makefile
src/Makefile
data/Makefile
- po/Makefile.in])
+])
AC_OUTPUT
+

0 comments on commit ed1f2ed

Please sign in to comment.