From: Andrea Zagli <azagli@libero.it>
Date: Fri, 22 Dec 2006 10:18:43 +0000 (+0000)
Subject: Some adjustments to autotools files.
X-Git-Tag: 0.0.3~14
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=53f42917521a1f198e3a338554dbf9b6405ff2a4;p=libgtkdateentry

Some adjustments to autotools files.
---

diff --git a/ChangeLog b/ChangeLog
index c03c715..66f3afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-22 Andrea Zagli <azagli@inwind.it>
+
+	* some adjustments to autotools files
+
 2006-12-20 Andrea Zagli <azagli@inwind.it>
 
 	* gtkdateentry.c: gtk_date_set_date_strf rewrited
diff --git a/configure.ac b/configure.ac
index 9a1a92e..ea138b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_PREREQ(2.59)
 AC_INIT([GtkDateEntry], [0.0.2], [azagli@inwind.it])
 AC_CONFIG_SRCDIR([src/gtkdateentry.c])
+AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE
 
@@ -10,7 +11,12 @@ AC_CANONICAL_SYSTEM
 
 AC_LIBTOOL_WIN32_DLL
 
+AC_PROG_CXX
 AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 
 # Checks for header files.
@@ -23,25 +29,11 @@ AC_STRUCT_TM
 
 GTK_DOC_CHECK(1.0)
 
-GTK_REQUIRED=2.6.8
-GTKMASKEDENTRY_REQUIRED=0.0.1
+PKG_CHECK_MODULES(GTKDATEENTRY, [gtk+-2.0 >= 2.6.8
+                                 libgtkmaskedentry >= 0.0.1])
 
-dnl Check for pkgconfig first
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-
-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(GTK, gtk+-2.0 >= $GTK_REQUIRED)
-PKG_CHECK_MODULES(GTKMASKEDENTRY, libgtkmaskedentry >= $GTKMASKEDENTRY_REQUIRED)
-
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-AC_SUBST(GTKMASKEDENTRY_CFLAGS)
-AC_SUBST(GTKMASKEDENTRY_LIBS)
+AC_SUBST(GTKDATEENTRY_CFLAGS)
+AC_SUBST(GTKDATEENTRY_LIBS)
 
 # Output files
 AC_CONFIG_FILES([
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 3db3a8f..aa0dbe5 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -67,8 +67,8 @@ expand_content_files=
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES = -I$(top_srcdir)/src $(GTK_CFLAGS) $(GTKMASKEDENTRY_CFLAGS)
-GTKDOC_LIBS = $(top_srcdir)/src/libgtkdateentry.la $(GTK_LIBS) $(GTKMASKEDENTRY_LIBS)
+INCLUDES = -I$(top_srcdir)/src $(GTKDATEENTRY_CFLAGS)
+GTKDOC_LIBS = $(top_srcdir)/src/libgtkdateentry.la $(GTKDATEENTRY_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/src/Makefile.am b/src/Makefile.am
index 30fc9bd..2093681 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,8 @@
-INCLUDES = $(WARN_CFLAGS) \
-           $(DISABLE_DEPRECATED_CFLAGS) \
-           $(GTK_CFLAGS) \
-           $(GTKMASKEDENTRY_CFLAGS)
+AM_CPPFLAGS = $(WARN_CFLAGS) \
+              $(DISABLE_DEPRECATED_CFLAGS) \
+              $(GTKDATEENTRY_CFLAGS)
 
-LIBS = $(GTK_LIBS) \
-       $(GTKMASKEDENTRY_LIBS)
+LIBS = $(GTKDATEENTRY_LIBS)
 
 lib_LTLIBRARIES = libgtkdateentry.la
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8b07ba1..0fdc73f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,8 @@
-INCLUDES = \
-	$(WARN_CFLAGS) \
-	$(DISABLE_DEPRECATED_CFLAGS) \
-	$(GTK_CFLAGS) \
-	-I../src
+AM_CPPFLAGS = $(WARN_CFLAGS) \
+	      $(DISABLE_DEPRECATED_CFLAGS) \
+	      $(GTKDATEENTRY_CFLAGS)
+	      -I../src
 
 LDADD = ../src/libgtkdateentry.la
 
-noinst_PROGRAMS = \
-	date_entry
+noinst_PROGRAMS = date_entry