make the stuff compile with autoconf/automake

git-svn-id: file:///home/lennart/svn/public/libasyncns/trunk@8 cc0fb855-19ed-0310-866e-8c1d96e4abae

7 files changed, 35 insertions, 138 deletions

diff --git a/Makefile.am b/Makefile.am
index 38619aa..5ed2467 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,24 +17,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-EXTRA_DIST = bootstrap.sh README LICENSE doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in libtool.m4 ltdl.m4
-SUBDIRS=polyp doc libltdl
+EXTRA_DIST = bootstrap.sh README LICENSE
+SUBDIRS=libasyncns
 
 MAINTAINERCLEANFILES=README
 noinst_DATA = README
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = polyplib.pc polyplib-simple.pc polyplib-error.pc polyplib-mainloop.pc polyplib-browse.pc
-
-if HAVE_GLIB20
-pkgconfig_DATA += \
-	 polyplib-glib-mainloop.pc
-endif
-
-if HAVE_GLIB12
-pkgconfig_DATA += \
-	polyplib-glib12-mainloop.pc
-endif
+pkgconfig_DATA = libasyncns.pc
 
 README:
 	rm -f README
diff --git a/configure.ac b/configure.ac
index 3c02c15..8bef643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 AC_PREREQ(2.57)
-AC_INIT([libasyncns],[0.1],[mz (at) 0pointer (dot) de])
-AC_CONFIG_SRCDIR([polyp/main.c])
+AC_INIT([libasyncns],[0.1],[mznflapaf (at) 0pointer (dot) de])
+AC_CONFIG_SRCDIR([libasyncns/asyncns.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
 
@@ -39,124 +39,14 @@ fi
 AC_PROG_CC
 
 # libtool stuff
-AC_LIBLTDL_INSTALLABLE
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
-AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
-AC_CONFIG_SUBDIRS(libltdl)
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h syslog.h])
-
-ACX_PTHREAD
-AC_PATH_XTRA
-
-HAVE_X11=0
-test "x$no_x" != "xyes" && HAVE_X11=1
-AC_SUBST(HAVE_X11)
-AM_CONDITIONAL(HAVE_X11, test "x$no_x" != "xyes")
-if test "x$no_x" != "xyes" ; then
-   AC_DEFINE([HAVE_X11], 1, [Have X11])
-fi
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_OFF_T
-AC_HEADER_TIME
-
-# Checks for library functions.
-AC_FUNC_FORK
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_LSTAT
-AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_FUNC_MMAP
-AC_FUNC_REALLOC
-AC_FUNC_SETPGRP
-AC_FUNC_VPRINTF
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_SELECT_ARGTYPES
-AC_TYPE_SIGNAL
-AC_TYPE_UID_T
-AC_CHECK_FUNCS([gethostname gettimeofday memchr memmove memset mkdir mkfifo munmap rmdir socket strcspn strerror strrchr strspn strstr strtol strtoul strcasecmp putenv strchr strpbrk strdup getgrgid_r getpwuid_r regcomp ftruncate select])
-AC_CHECK_LIB(m, pow)
-AC_CHECK_FUNCS(pow)
-AC_FUNC_STAT
-AC_HEADER_SYS_WAIT
-AC_HEADER_DIRENT
-
-AC_C_BIGENDIAN
-AC_FUNC_GETGROUPS
-
-AC_CHECK_LIB(cap, cap_init, [CAP_LIBS='-lcap'], [CAP_LIBS=''])
-AC_SUBST(CAP_LIBS)
-
-AC_CHECK_HEADERS(sys/capability.h)
 
 AC_CHECK_FUNCS(setresuid)
 AC_CHECK_FUNCS(setreuid)
 
-PKG_CHECK_MODULES(LIBSAMPLERATE, [ samplerate >= 0.1.0 ])
-AC_SUBST(LIBSAMPLERATE_CFLAGS)
-AC_SUBST(LIBSAMPLERATE_LIBS)
-
-PKG_CHECK_MODULES(LIBSNDFILE, [ sndfile >= 1.0.10 ])
-AC_SUBST(LIBSNDFILE_CFLAGS)
-AC_SUBST(LIBSNDFILE_LIBS)
-
-PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.0 ], [HAVE_ALSA=1], [HAVE_ALSA=0])
-AC_SUBST(ASOUNDLIB_CFLAGS)
-AC_SUBST(ASOUNDLIB_LIBS) 
-AC_SUBST(HAVE_ALSA)
-AM_CONDITIONAL([HAVE_ALSA], [test "x$HAVE_ALSA" = x1])
-
-PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ], HAVE_GLIB20=1, HAVE_GLIB20=0)
-AC_SUBST(GLIB20_CFLAGS)
-AC_SUBST(GLIB20_LIBS)
-AC_SUBST(HAVE_GLIB20)
-AM_CONDITIONAL([HAVE_GLIB20], [test "x$HAVE_GLIB20" = x1])
-
-PKG_CHECK_MODULES(GLIB12, [ glib >= 1.2.0 ], HAVE_GLIB12=1, HAVE_GLIB12=0)
-AC_SUBST(GLIB12_CFLAGS)
-AC_SUBST(GLIB12_LIBS)
-AC_SUBST(HAVE_GLIB12)
-AM_CONDITIONAL([HAVE_GLIB12], [test "x$HAVE_GLIB12" = x1])
-
-PKG_CHECK_MODULES(HOWL, [ howl >= 0.9.8 ], HAVE_HOWL=1, HAVE_HOWL=0)
-AC_SUBST(HOWL_CFLAGS)
-AC_SUBST(HOWL_LIBS)
-AC_SUBST(HAVE_HOWL)
-AM_CONDITIONAL([HAVE_HOWL], [test "x$HAVE_HOWL" = x1])
-
-AC_PATH_PROG([M4], [m4 gm4], [no])
-if test "x$M4" = xno ; then
-   AC_MSG_ERROR([m4 missing])
-fi
-
-AC_MSG_CHECKING([for tcpwrap library and headers])
-LIBWRAP_LIBS=
-saved_LIBS="$LIBS"
-LIBS="$LIBS -lwrap"
-AC_LINK_IFELSE(
-AC_LANG_PROGRAM(
-[#include <tcpd.h>
-#include <syslog.h>
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;],
-[struct request_info *req; 
-return hosts_access (req);]),
-[AC_DEFINE(HAVE_LIBWRAP, [], [Have tcpwrap?])
-LIBWRAP_LIBS="-lwrap"
-AC_MSG_RESULT(yes)],
-[AC_MSG_RESULT(no)])
-AC_SUBST(LIBWRAP_LIBS)
-LIBS="$saved_LIBS"
-
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
    CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
@@ -185,7 +75,5 @@ fi
 
 AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes])
 
-AM_CONDITIONAL(BUILD_LIBPOLYPCORE, false)
-
-AC_CONFIG_FILES([Makefile polyp/Makefile polyplib.pc polyplib-simple.pc polyplib-mainloop.pc polyplib-browse.pc polyplib-error.pc polyplib-glib-mainloop.pc polyplib-glib12-mainloop.pc doc/Makefile doc/README.html doc/cli.html doc/daemon.html doc/modules.html doxygen/Makefile doxygen/doxygen.conf polyp/polyplib-version.h doc/FAQ.html])
+AC_CONFIG_FILES([Makefile libasyncns/Makefile])
 AC_OUTPUT
diff --git a/libasyncns/Makefile b/libasyncns/Makefile
deleted file mode 100644
index 93af173..0000000
--- a/libasyncns/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-CFLAGS=-Wall -W -O0 -g -pipe
-
-
-asyncns-test: asyncns.o asyncns-test.o
-	$(CC) -o $@ $^ $(LIBS) $(CFLAGS)
-
-clean:
-	rm -rf *.o asyncns-test
diff --git a/libasyncns/Makefile.am b/libasyncns/Makefile.am
new file mode 100644
index 0000000..8568caf
--- /dev/null
+++ b/libasyncns/Makefile.am
@@ -0,0 +1,28 @@
+# $Id$
+#
+# This file is part of libasyncns.
+#
+# libasyncns is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# libasyncns is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with libasyncns; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+AM_CFLAGS=-D_GNU_SOURCE 
+
+lib_LTLIBRARIES=libasyncns.la
+libasyncns_la_SOURCES=asyncns.c asyncns.h
+
+noinst_PROGRAMS=asyncns-test
+asyncns_test_SOURCES=asyncns-test.c
+asyncns_test_LDADD=libasyncns.la
+
diff --git a/libasyncns/asyncns-test.c b/libasyncns/asyncns-test.c
index 6de3337..58f337f 100644
--- a/libasyncns/asyncns-test.c
+++ b/libasyncns/asyncns-test.c
@@ -23,7 +23,6 @@ int main(int argc, char *argv[]) {
         goto fail;
     }
 
-
     memset(&sa, 0, sizeof(sa));
     sa.sin_family = AF_INET;
     sa.sin_addr.s_addr = inet_addr("192.168.50.1");
diff --git a/libasyncns/asyncns.c b/libasyncns/asyncns.c
index fa62003..7bc65d8 100644
--- a/libasyncns/asyncns.c
+++ b/libasyncns/asyncns.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #define HAVE_PR_SET_PDEATHSIG
 #define HAVE_SETRESUID
 
diff --git a/libasyncns/asyncns.h b/libasyncns/asyncns.h
index 05873a6..861f15c 100644
--- a/libasyncns/asyncns.h
+++ b/libasyncns/asyncns.h
@@ -1,6 +1,7 @@
 #ifndef fooasyncnshfoo
 #define fooasyncnshfoo
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>