# HG changeset patch
# User renatofilho
# Date 1203964834 0
# Node ID 00536b0eb88b5ee82f7ce4e0d365b089345a9601
# Parent  2cd533f0c6379db1697d89350fed37d9a4cee41e
[svn r938] fixed autotools scripts

diff -r 2cd533f0c637 -r 00536b0eb88b gmyth-upnp/Makefile.am
--- a/gmyth-upnp/Makefile.am	Mon Feb 25 18:11:02 2008 +0000
+++ b/gmyth-upnp/Makefile.am	Mon Feb 25 18:40:34 2008 +0000
@@ -1,21 +1,12 @@
 SUBDIRS= src tests
 
-### all of the standard pc files we need to generate
-pcfiles = gmyth-upnp.pc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gmyth-upnp.pc
 
-all-local: $(pcfiles)
+EXTRA_DIST = \
+	autogen.sh			\
+	gmyth-upnp.pc.in	\
+	AUTHORS				\
+	COPYING				\
+	README
 
-### how to generate pc files
-%.pc: %.pc
-	cp $< $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-
-EXTRA_DIST =                            \
-        autogen.sh                      \
-        gmyth-upnp.pc.in		\
-        AUTHORS                         \
-        COPYING                         \
-        README
-
diff -r 2cd533f0c637 -r 00536b0eb88b gmyth-upnp/configure.ac
--- a/gmyth-upnp/configure.ac	Mon Feb 25 18:11:02 2008 +0000
+++ b/gmyth-upnp/configure.ac	Mon Feb 25 18:40:34 2008 +0000
@@ -1,82 +1,29 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
+AC_INIT(gmyth-upnp, 0.7.0)
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.ac)
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_ISC_POSIX
 
-AC_PREREQ(2.50)
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
+AM_CONFIG_HEADER(config.h)
 
-AC_INIT([gmyth-upnp],[0.7.1])
-
-AC_CONFIG_SRCDIR([src/gmyth_upnp.c])
-AC_CONFIG_HEADER(config.h)
-
-dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
-AM_MAINTAINER_MODE
 dnl make aclocal work in maintainer mode
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 
-# Checks for programs.
-# check for tools
-# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
-CFLAGS="$CFLAGS -Wall"
+AC_PROG_CXX
 AC_PROG_CC
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+AC_C_BIGENDIAN
+AC_C_CONST
+
+AC_LIBTOOL_WIN32_DLL
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 AC_PROG_LIBTOOL
 
-# Checks for libraries.
-
-# Check for pkgconfig
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-# 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
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_PID_T
-AC_STRUCT_TM
-AC_HEADER_TIME
-AC_HEADER_STDBOOL
-
-# Checks for library functions.
-AC_FUNC_FORK
-AC_FUNC_STRFTIME
-AC_FUNC_SELECT_ARGTYPES
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
-AC_FUNC_MKTIME
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([memset socket stime strstr strtoul gethostname inet_ntoa localtime_r select strrchr localtime strptime])
-
-##############################
-# Checks for Network functions
-##############################
-
-AC_CHECK_FUNCS([socket])
-AC_CHECK_FUNCS([inet_ntoa])
-AC_CHECK_HEADERS([ifaddrs.h])
-AC_CHECK_FUNCS([getifaddrs])
-AC_CHECK_FUNCS([time])
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-
-CFLAGS="$CFLAGS -I/usr/include"
-LDFLAGS="$LDFLAGS -L/usr/lib"
-
 # Checks required packages
 
-dnl Test if --disable-debug given
-AC_ARG_ENABLE(debug,
-	AC_HELP_STRING([--disable-debug], [enable debugging mode]))
-if test x"$enable_debug" != xno; then
-    CFLAGS="$CFLAGS -g -DGMYTH_USE_DEBUG"
-else
-    CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
-fi 
-
 # Check for Glib2.0
 PKG_CHECK_MODULES(GLIB, glib-2.0, HAVE_GLIB=yes,HAVE_GLIB=no)
 
@@ -115,7 +62,6 @@
 AC_SUBST(LIBGMYTH_CFLAGS)
 AC_SUBST(LIBGMYTH_LIBS)
 
-dnl ========== Check for Cyberlink UPnP Libraries
 PKG_CHECK_MODULES(LIBUPNP, libupnp, HAVE_LIBUPNP=yes, HAVE_LIBUPNP=no)
 
 if test "x$HAVE_LIBUPNP" = "xno"; then
@@ -130,10 +76,3 @@
 src/Makefile
 tests/Makefile
 gmyth-upnp.pc])
-
-if test "x$enable_debug" != "xno"; then
-    AC_MSG_NOTICE([Debug: Enabled])
-else
-    AC_MSG_NOTICE([Debug: Disabled])
-fi
-
diff -r 2cd533f0c637 -r 00536b0eb88b gmyth-upnp/gmyth-upnp.pc.in
--- a/gmyth-upnp/gmyth-upnp.pc.in	Mon Feb 25 18:11:02 2008 +0000
+++ b/gmyth-upnp/gmyth-upnp.pc.in	Mon Feb 25 18:40:34 2008 +0000
@@ -5,8 +5,8 @@
 
 Name: gmyth-upnp
 Description: Myth TV upnp library based upon GLib/GObject paradigm
-Version: 0.7.1
-Requires: gobject-2.0 glib-2.0 libupnp
+Version: @VERSION@
+Requires: gobject-2.0 glib-2.0 libupnp gmyth
 
-Libs: @LIBGMYTH_LIBS@ -L${libdir} -lgmythupnp
-Cflags: @LIBGMYTH_CFLAGS@ -I${includedir}/gmyth-upnp
+Libs: -L${libdir} -lgmythupnp
+Cflags: -I${includedir}/gmyth-upnp