1.1 --- a/gmyth-upnp/configure.ac	Mon Feb 25 14:14:29 2008 +0000
     1.2 +++ b/gmyth-upnp/configure.ac	Mon Feb 25 18:40:34 2008 +0000
     1.3 @@ -1,82 +1,29 @@
     1.4 -#                                               -*- Autoconf -*-
     1.5 -# Process this file with autoconf to produce a configure script.
     1.6 +AC_INIT(gmyth-upnp, 0.7.0)
     1.7 +AC_PREREQ(2.52)
     1.8 +AC_CONFIG_SRCDIR(configure.ac)
     1.9 +AC_CANONICAL_BUILD
    1.10 +AC_CANONICAL_HOST
    1.11 +AC_ISC_POSIX
    1.12  
    1.13 -AC_PREREQ(2.50)
    1.14 +AM_INIT_AUTOMAKE(1.6 dist-bzip2)
    1.15 +AM_CONFIG_HEADER(config.h)
    1.16  
    1.17 -AC_INIT([gmyth-upnp],[0.7.1])
    1.18 -
    1.19 -AC_CONFIG_SRCDIR([src/gmyth_upnp.c])
    1.20 -AC_CONFIG_HEADER(config.h)
    1.21 -
    1.22 -dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode
    1.23 -AM_MAINTAINER_MODE
    1.24  dnl make aclocal work in maintainer mode
    1.25  AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
    1.26  
    1.27 -# Checks for programs.
    1.28 -# check for tools
    1.29 -# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g
    1.30 -CFLAGS="$CFLAGS -Wall"
    1.31 +AC_PROG_CXX
    1.32  AC_PROG_CC
    1.33 +AM_PROG_CC_STDC
    1.34 +AC_HEADER_STDC
    1.35 +AC_C_BIGENDIAN
    1.36 +AC_C_CONST
    1.37 +
    1.38 +AC_LIBTOOL_WIN32_DLL
    1.39 +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
    1.40  AC_PROG_LIBTOOL
    1.41  
    1.42 -# Checks for libraries.
    1.43 -
    1.44 -# Check for pkgconfig
    1.45 -AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
    1.46 -# Give error and exit if we don't have pkgconfig
    1.47 -if test "x$HAVE_PKGCONFIG" = "xno"; then
    1.48 -  AC_MSG_ERROR(you need to have pkgconfig installed !)
    1.49 -fi
    1.50 -
    1.51 -# Checks for header files.
    1.52 -AC_HEADER_STDC
    1.53 -AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h])
    1.54 -
    1.55 -# Checks for typedefs, structures, and compiler characteristics.
    1.56 -AC_C_CONST
    1.57 -AC_TYPE_PID_T
    1.58 -AC_STRUCT_TM
    1.59 -AC_HEADER_TIME
    1.60 -AC_HEADER_STDBOOL
    1.61 -
    1.62 -# Checks for library functions.
    1.63 -AC_FUNC_FORK
    1.64 -AC_FUNC_STRFTIME
    1.65 -AC_FUNC_SELECT_ARGTYPES
    1.66 -AC_PROG_GCC_TRADITIONAL
    1.67 -AC_FUNC_MALLOC
    1.68 -AC_FUNC_MKTIME
    1.69 -AC_FUNC_STRFTIME
    1.70 -AC_FUNC_VPRINTF
    1.71 -AC_CHECK_FUNCS([memset socket stime strstr strtoul gethostname inet_ntoa localtime_r select strrchr localtime strptime])
    1.72 -
    1.73 -##############################
    1.74 -# Checks for Network functions
    1.75 -##############################
    1.76 -
    1.77 -AC_CHECK_FUNCS([socket])
    1.78 -AC_CHECK_FUNCS([inet_ntoa])
    1.79 -AC_CHECK_HEADERS([ifaddrs.h])
    1.80 -AC_CHECK_FUNCS([getifaddrs])
    1.81 -AC_CHECK_FUNCS([time])
    1.82 -
    1.83 -AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
    1.84 -
    1.85 -CFLAGS="$CFLAGS -I/usr/include"
    1.86 -LDFLAGS="$LDFLAGS -L/usr/lib"
    1.87 -
    1.88  # Checks required packages
    1.89  
    1.90 -dnl Test if --disable-debug given
    1.91 -AC_ARG_ENABLE(debug,
    1.92 -	AC_HELP_STRING([--disable-debug], [enable debugging mode]))
    1.93 -if test x"$enable_debug" != xno; then
    1.94 -    CFLAGS="$CFLAGS -g -DGMYTH_USE_DEBUG"
    1.95 -else
    1.96 -    CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
    1.97 -fi 
    1.98 -
    1.99  # Check for Glib2.0
   1.100  PKG_CHECK_MODULES(GLIB, glib-2.0, HAVE_GLIB=yes,HAVE_GLIB=no)
   1.101  
   1.102 @@ -115,7 +62,6 @@
   1.103  AC_SUBST(LIBGMYTH_CFLAGS)
   1.104  AC_SUBST(LIBGMYTH_LIBS)
   1.105  
   1.106 -dnl ========== Check for Cyberlink UPnP Libraries
   1.107  PKG_CHECK_MODULES(LIBUPNP, libupnp, HAVE_LIBUPNP=yes, HAVE_LIBUPNP=no)
   1.108  
   1.109  if test "x$HAVE_LIBUPNP" = "xno"; then
   1.110 @@ -130,10 +76,3 @@
   1.111  src/Makefile
   1.112  tests/Makefile
   1.113  gmyth-upnp.pc])
   1.114 -
   1.115 -if test "x$enable_debug" != "xno"; then
   1.116 -    AC_MSG_NOTICE([Debug: Enabled])
   1.117 -else
   1.118 -    AC_MSG_NOTICE([Debug: Disabled])
   1.119 -fi
   1.120 -