1.1 --- a/gmyth-upnp/Makefile.am Mon Feb 25 18:11:02 2008 +0000
1.2 +++ b/gmyth-upnp/Makefile.am Mon Feb 25 18:40:34 2008 +0000
1.3 @@ -1,21 +1,12 @@
1.4 SUBDIRS= src tests
1.5
1.6 -### all of the standard pc files we need to generate
1.7 -pcfiles = gmyth-upnp.pc
1.8 +pkgconfigdir = $(libdir)/pkgconfig
1.9 +pkgconfig_DATA = gmyth-upnp.pc
1.10
1.11 -all-local: $(pcfiles)
1.12 +EXTRA_DIST = \
1.13 + autogen.sh \
1.14 + gmyth-upnp.pc.in \
1.15 + AUTHORS \
1.16 + COPYING \
1.17 + README
1.18
1.19 -### how to generate pc files
1.20 -%.pc: %.pc
1.21 - cp $< $@
1.22 -
1.23 -pkgconfigdir = $(libdir)/pkgconfig
1.24 -pkgconfig_DATA = $(pcfiles)
1.25 -
1.26 -EXTRA_DIST = \
1.27 - autogen.sh \
1.28 - gmyth-upnp.pc.in \
1.29 - AUTHORS \
1.30 - COPYING \
1.31 - README
1.32 -
2.1 --- a/gmyth-upnp/configure.ac Mon Feb 25 18:11:02 2008 +0000
2.2 +++ b/gmyth-upnp/configure.ac Mon Feb 25 18:40:34 2008 +0000
2.3 @@ -1,82 +1,29 @@
2.4 -# -*- Autoconf -*-
2.5 -# Process this file with autoconf to produce a configure script.
2.6 +AC_INIT(gmyth-upnp, 0.7.0)
2.7 +AC_PREREQ(2.52)
2.8 +AC_CONFIG_SRCDIR(configure.ac)
2.9 +AC_CANONICAL_BUILD
2.10 +AC_CANONICAL_HOST
2.11 +AC_ISC_POSIX
2.12
2.13 -AC_PREREQ(2.50)
2.14 +AM_INIT_AUTOMAKE(1.6 dist-bzip2)
2.15 +AM_CONFIG_HEADER(config.h)
2.16
2.17 -AC_INIT([gmyth-upnp],[0.7.1])
2.18 -
2.19 -AC_CONFIG_SRCDIR([src/gmyth_upnp.c])
2.20 -AC_CONFIG_HEADER(config.h)
2.21 -
2.22 -dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
2.23 -AM_MAINTAINER_MODE
2.24 dnl make aclocal work in maintainer mode
2.25 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
2.26
2.27 -# Checks for programs.
2.28 -# check for tools
2.29 -# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
2.30 -CFLAGS="$CFLAGS -Wall"
2.31 +AC_PROG_CXX
2.32 AC_PROG_CC
2.33 +AM_PROG_CC_STDC
2.34 +AC_HEADER_STDC
2.35 +AC_C_BIGENDIAN
2.36 +AC_C_CONST
2.37 +
2.38 +AC_LIBTOOL_WIN32_DLL
2.39 +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
2.40 AC_PROG_LIBTOOL
2.41
2.42 -# Checks for libraries.
2.43 -
2.44 -# Check for pkgconfig
2.45 -AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
2.46 -# Give error and exit if we don't have pkgconfig
2.47 -if test "x$HAVE_PKGCONFIG" = "xno"; then
2.48 - AC_MSG_ERROR(you need to have pkgconfig installed !)
2.49 -fi
2.50 -
2.51 -# Checks for header files.
2.52 -AC_HEADER_STDC
2.53 -AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h])
2.54 -
2.55 -# Checks for typedefs, structures, and compiler characteristics.
2.56 -AC_C_CONST
2.57 -AC_TYPE_PID_T
2.58 -AC_STRUCT_TM
2.59 -AC_HEADER_TIME
2.60 -AC_HEADER_STDBOOL
2.61 -
2.62 -# Checks for library functions.
2.63 -AC_FUNC_FORK
2.64 -AC_FUNC_STRFTIME
2.65 -AC_FUNC_SELECT_ARGTYPES
2.66 -AC_PROG_GCC_TRADITIONAL
2.67 -AC_FUNC_MALLOC
2.68 -AC_FUNC_MKTIME
2.69 -AC_FUNC_STRFTIME
2.70 -AC_FUNC_VPRINTF
2.71 -AC_CHECK_FUNCS([memset socket stime strstr strtoul gethostname inet_ntoa localtime_r select strrchr localtime strptime])
2.72 -
2.73 -##############################
2.74 -# Checks for Network functions
2.75 -##############################
2.76 -
2.77 -AC_CHECK_FUNCS([socket])
2.78 -AC_CHECK_FUNCS([inet_ntoa])
2.79 -AC_CHECK_HEADERS([ifaddrs.h])
2.80 -AC_CHECK_FUNCS([getifaddrs])
2.81 -AC_CHECK_FUNCS([time])
2.82 -
2.83 -AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
2.84 -
2.85 -CFLAGS="$CFLAGS -I/usr/include"
2.86 -LDFLAGS="$LDFLAGS -L/usr/lib"
2.87 -
2.88 # Checks required packages
2.89
2.90 -dnl Test if --disable-debug given
2.91 -AC_ARG_ENABLE(debug,
2.92 - AC_HELP_STRING([--disable-debug], [enable debugging mode]))
2.93 -if test x"$enable_debug" != xno; then
2.94 - CFLAGS="$CFLAGS -g -DGMYTH_USE_DEBUG"
2.95 -else
2.96 - CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
2.97 -fi
2.98 -
2.99 # Check for Glib2.0
2.100 PKG_CHECK_MODULES(GLIB, glib-2.0, HAVE_GLIB=yes,HAVE_GLIB=no)
2.101
2.102 @@ -115,7 +62,6 @@
2.103 AC_SUBST(LIBGMYTH_CFLAGS)
2.104 AC_SUBST(LIBGMYTH_LIBS)
2.105
2.106 -dnl ========== Check for Cyberlink UPnP Libraries
2.107 PKG_CHECK_MODULES(LIBUPNP, libupnp, HAVE_LIBUPNP=yes, HAVE_LIBUPNP=no)
2.108
2.109 if test "x$HAVE_LIBUPNP" = "xno"; then
2.110 @@ -130,10 +76,3 @@
2.111 src/Makefile
2.112 tests/Makefile
2.113 gmyth-upnp.pc])
2.114 -
2.115 -if test "x$enable_debug" != "xno"; then
2.116 - AC_MSG_NOTICE([Debug: Enabled])
2.117 -else
2.118 - AC_MSG_NOTICE([Debug: Disabled])
2.119 -fi
2.120 -
3.1 --- a/gmyth-upnp/gmyth-upnp.pc.in Mon Feb 25 18:11:02 2008 +0000
3.2 +++ b/gmyth-upnp/gmyth-upnp.pc.in Mon Feb 25 18:40:34 2008 +0000
3.3 @@ -5,8 +5,8 @@
3.4
3.5 Name: gmyth-upnp
3.6 Description: Myth TV upnp library based upon GLib/GObject paradigm
3.7 -Version: 0.7.1
3.8 -Requires: gobject-2.0 glib-2.0 libupnp
3.9 +Version: @VERSION@
3.10 +Requires: gobject-2.0 glib-2.0 libupnp gmyth
3.11
3.12 -Libs: @LIBGMYTH_LIBS@ -L${libdir} -lgmythupnp
3.13 -Cflags: @LIBGMYTH_CFLAGS@ -I${includedir}/gmyth-upnp
3.14 +Libs: -L${libdir} -lgmythupnp
3.15 +Cflags: -I${includedir}/gmyth-upnp