Changeset 1015

Timestamp:

03/14/08 18:12:13 (9 months ago)

Author:

alonbl

Message:

New build system

Location:

branches/alonbl/build

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (2 diffs)
• aclocal (modified) (1 prop)
• aclocal/Makefile.am (modified) (1 diff)
• aclocal/ac_compile_check_sizeof.m4 (deleted)
• aclocal/ac_create_stdint_h.m4 (modified) (2 diffs)
• aclocal/pkg.m4 (deleted)
• configure.ac (modified) (5 diffs)
• doc (modified) (1 prop)
• doc/Makefile.am (modified) (1 diff)
• doc/changelog.sh (deleted)
• doc/doxygen-footer.html (added)
• doc/doxygen.conf.in (modified) (28 diffs)
• doc/export-wiki.sh (deleted)
• doc/export-wiki.xsl (deleted)
• doc/generate-api.sh (deleted)
• doc/nonpersistent (added)
• doc/nonpersistent/Makefile.am (added)
• doc/nonpersistent/export-wiki.sh (added)
• doc/nonpersistent/export-wiki.xsl (added)
• doc/nonpersistent/svn2cl.xsl (added)
• doc/opensc-logo.gif (added)
• doc/svn2cl.xsl (deleted)
• etc (modified) (1 prop)
• etc/Makefile.am (modified) (1 diff)
• macos (modified) (1 prop)
• macos/Makefile.am (modified) (1 diff)
• solaris (modified) (1 prop)
• src (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/ct (modified) (1 prop)
• src/ct/Makefile.am (modified) (1 diff)
• src/ctapi (modified) (1 prop)
• src/ctapi/Makefile.am (modified) (1 diff)
• src/ifd (modified) (1 prop)
• src/ifd/Makefile.am (modified) (2 diffs)
• src/ifd/atr.c (modified) (1 diff)
• src/ifd/ifd-cm4000.c (modified) (1 diff)
• src/ifd/ifd-pertosmart1030.c (modified) (1 diff)
• src/ifd/ifd-pertosmart1038.c (modified) (1 diff)
• src/ifd/ifd-rutoken.c (modified) (1 diff)
• src/include (modified) (1 prop)
• src/include/Makefile.am (modified) (1 diff)
• src/include/openct (modified) (1 prop)
• src/include/openct/Makefile.am (modified) (1 diff)
• src/pcsc (modified) (1 prop)
• src/pcsc/Makefile.am (modified) (1 diff)
• src/tools (modified) (1 prop)
• src/tools/Makefile.am (modified) (1 diff)
• svnignore (added)

branches/alonbl/build

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-archive
-acinclude.m4
-aclocal.m4
-autom4te.cache
-compile
-confdefs.h
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-conftest
-conftest.c
-depcomp
-install-sh
-libtool
-libtool.m4
-ltmain.sh
-missing
-mkinstalldirs
-so_locations
-stamp-h*
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+*.loT
+
+ChangeLog
+doxygen.conf
+reader.conf
+openct_serial
+openct.hald
+openct_usb
+openct_pcmcia
+init-script
+openct.conf
+types.h
+ifdhandler
+ifdproxy
+openct-tool
+openct-control

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-archive
-acinclude.m4
-aclocal.m4
-autom4te.cache
-compile
-confdefs.h
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-conftest
-conftest.c
-depcomp
-install-sh
-libtool
-libtool.m4
-ltmain.sh
-missing
-mkinstalldirs
-so_locations
-stamp-h*
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+*.loT
+
+ChangeLog
+doxygen.conf
+reader.conf
+openct_serial
+openct.hald
+openct_usb
+openct_pcmcia
+init-script
+openct.conf
+types.h
+ifdhandler
+ifdproxy
+openct-tool
+openct-control

branches/alonbl/build/Makefile.am

@@ -1 +1 @@
 # Process this file with automake to create Makefile.in
+#
+AUTOMAKE_OPTIONS = foreign 1.10
+ACLOCAL_AMFLAGS = -I aclocal
 
-SUBDIRS = . aclocal etc macos src 
-DIST_SUBDIRS = . aclocal doc etc macos src 
+MAINTAINERCLEANFILES = \
+        Makefile.in config.h.in config.h.in~ configure \
+        install-sh ltmain.sh missing mkinstalldirs \
+        compile depcomp config.log config.status \
+        config.guess config.sub acinclude.m4 aclocal.m4
 
-EXTRA_DIST = LGPL-2.1 NEWS TODO bootstrap depcomp \
+DEPCLEANFILES = config.log configure
+
+SUBDIRS = aclocal etc macos src doc
+
+doc_DATA = NEWS
+
+dist_noinst_DATA = LGPL-2.1 NEWS TODO bootstrap depcomp \
         solaris/Makefile.client solaris/Makefile.server solaris/README \
         solaris/checkinstall.in solaris/devices-openct-fabric.xml-dist \
@@ -11 +23 @@
         solaris/preremove solaris/proto
 
-MAINTAINERCLEANFILES = \
-        Makefile.in config.h.in configure \
-        install-sh ltmain.sh missing mkinstalldirs \
-        compile depcomp config.log config.status \
-        config.guess config.sub acinclude.m4 aclocal.m4
-
-DEPCLEANFILES = config.log configure
-
-AUTOMAKE_OPTIONS = foreign 1.5
-ACLOCAL_AMFLAGS = -I aclocal

branches/alonbl/build/aclocal

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+*.loT
+
+ChangeLog
+doxygen.conf
+reader.conf
+openct_serial
+openct.hald
+openct_usb
+openct_pcmcia
+init-script
+openct.conf
+types.h
+ifdhandler
+ifdproxy
+openct-tool
+openct-control

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+*.loT
+
+ChangeLog
+doxygen.conf
+reader.conf
+openct_serial
+openct.hald
+openct_usb
+openct_pcmcia
+init-script
+openct.conf
+types.h
+ifdhandler
+ifdproxy
+openct-tool
+openct-control

branches/alonbl/build/aclocal/Makefile.am

@@ -1 @@
-# Process this file with automake to create Makefile.in
-
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = ac_compile_check_sizeof.m4 ac_create_stdint_h.m4 \
-        acx_pthread.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 pkg.m4
+dist_noinst_DATA = ac_create_stdint_h.m4 \
+        acx_pthread.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4

branches/alonbl/build/aclocal/ac_create_stdint_h.m4

@@ -16 +16 @@
 dnl int_least32_t.. int_fast32_t.. intmax_t
 dnl which may or may not rely on the definitions of other files,
-dnl or using the AC_COMPILE_CHECK_SIZEOF macro to determine the actual
+dnl or using the AC_CHECK_SIZEOF macro to determine the actual
 dnl sizeof each type.
 dnl
@@ -90 +90 @@
 
 if test "$ac_cv_header_stdint_x" = "no-file" ; then
-   AC_COMPILE_CHECK_SIZEOF(char)
-   AC_COMPILE_CHECK_SIZEOF(short)
-   AC_COMPILE_CHECK_SIZEOF(int)
-   AC_COMPILE_CHECK_SIZEOF(long)
-   AC_COMPILE_CHECK_SIZEOF(void*)
+   AC_CHECK_SIZEOF(char)
+   AC_CHECK_SIZEOF(short)
+   AC_CHECK_SIZEOF(int)
+   AC_CHECK_SIZEOF(long)
+   AC_CHECK_SIZEOF(void*)
    ac_cv_header_stdint_test="yes"
 else

branches/alonbl/build/configure.ac

@@ -1 +1 @@
 dnl -*- mode: m4; -*-
-dnl Process this file with autoconf to produce a configure script.
-
-# Require autoconf 2.52
-AC_PREREQ(2.52)
-AC_INIT([openct], [0.6.14-svn])
-AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
-
-AC_CONFIG_SRCDIR(src/ifd/ifdhandler.c)
+
+AC_PREREQ([2.60])
+
+define([PACKAGE_VERSION_MAJOR], [0])
+define([PACKAGE_VERSION_MINOR], [6])
+define([PACKAGE_VERSION_FIX], [14])
+
+AC_INIT([openct], [PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX-svn])
+AC_CONFIG_AUX_DIR([.])
+AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
+
+OPENCT_VERSION_MAJOR="PACKAGE_VERSION_MAJOR"
+OPENCT_VERSION_MINOR="PACKAGE_VERSION_MINOR"
+OPENCT_VERSION_FIX="PACKAGE_VERSION_FIX"
 
 # LT Version numbers, remember to change them just *before* a release.
@@ -15 +21 @@
 #   (Interfaces added:                  AGE++)
 #   (Interfaces removed:                AGE=0)
-OPENCT_LT_CURRENT=1
-OPENCT_LT_REVISION=0
-OPENCT_LT_AGE=0
-
-AC_SUBST(OPENCT_LT_CURRENT)
-AC_SUBST(OPENCT_LT_REVISION)
-AC_SUBST(OPENCT_LT_AGE)
+OPENCT_LT_CURRENT="1"
+OPENCT_LT_REVISION="0"
+OPENCT_LT_AGE="0"
+
+AC_CONFIG_SRCDIR(src/ifd/ifdhandler.c)
 
 AC_CANONICAL_HOST
 AC_PROG_CC
+PKG_PROG_PKG_CONFIG
 AC_C_BIGENDIAN
 
+AC_MSG_CHECKING([svn checkout])
+if test -e packaged; then
+        svn_checkout="no"
+else
+        svn_checkout="yes"
+fi
+AC_MSG_RESULT([${svn_checkout}])
+
 dnl Check for some target-specific stuff
-case "$host" in
-*-*-hpux*)
-        CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED"
+case "${host}" in
+        *-*-hpux*)
+                CPPFLAGS="${CPPFLAGS} -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED"
         ;;
-*-*-solaris*)
-        CPPFLAGS="$CPPFLAGS -I/usr/sfw/include -I/usr/local/include"
-        LDFLAGS="$LDFLAGS -L/usr/sfw/lib -R/usr/sfw/lib -L/usr/local/lib -R/usr/local/lib"
-        need_dash_r=1
+        *-*-solaris*)
+                CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+                LDFLAGS="${LDFLAGS} -L/usr/local/lib -R/usr/local/lib"
+                need_dash_r="1"
         ;;
-*-*-sunos4*)
-        CPPFLAGS="$CPPFLAGS -DSUNOS4"
+        *-*-sunos4*)
+                CPPFLAGS="${CPPFLAGS} -DSUNOS4"
         ;;
-*-*-aix*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-        if (test "$LD" != "gcc" && test -z "$blibpath"); then
-                blibpath="/usr/lib:/lib:/usr/local/lib"
-        fi
+        *-*-aix*)
+                CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+                LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+                if test "${LD}" != "gcc" -a -z "${blibpath}"; then
+                        blibpath="/usr/lib:/lib:/usr/local/lib"
+                fi
         ;;
-*-*-osf*)
-        CPPFLAGS="$CPPFLAGS -D_POSIX_PII_SOCKET"
+        *-*-osf*)
+                CPPFLAGS="${CPPFLAGS} -D_POSIX_PII_SOCKET"
         ;;
-*-*-linux*)
-        ;;
-*-*-darwin*)
-        LIBS="$LIBS -Wl,-framework,CoreFoundation"
-        if test "$GCC" = "yes"; then
-                CFLAGS="$CFLAGS -no-cpp-precomp"
-        fi
+        *-*-darwin*)
+                LIBS="${LIBS} -Wl,-framework,CoreFoundation"
+                if test "${GCC}" = "yes"; then
+                        CFLAGS="${CFLAGS} -no-cpp-precomp"
+                fi
         ;;
 esac
 
-AC_ARG_WITH(common-dir,
-        AC_HELP_STRING([--with-common-dir=PATH], [Specify path for common installation libraries]),
-        [
-                if test "x$withval" != "xno" ; then
-                        trycommondir=$withval
-                fi
-        ]
-)
-
-saved_LDFLAGS="$LDFLAGS"
-saved_CPPFLAGS="$CPPFLAGS"
-AC_CACHE_CHECK([for common directory], ac_cv_commondir, [
-        for commondir in $trycommondir "" /usr/local /usr/pkg /opt ; do
-                # Skip directories if they don't exist
-                if test ! -z "$commondir" -a ! -d "$commondir/" ; then
-                        continue;
-                fi
-                CPPFLAGS="$saved_CPPFLAGS"
-                LDFLAGS="$saved_LDFLAGS"
-
-                if test ! -z "$commondir" -a "x$commondir" != "x/usr"; then
-                        LDFLAGS="-L$commondir/lib $saved_LDFLAGS"
-                        if test ! -z "$need_dash_r" ; then
-                                LDFLAGS="-R$commondir/lib $LDFLAGS"
-                        fi
-                        CPPFLAGS="-I$commondir/include $saved_CPPFLAGS"
-                fi
-                break;
-        done
-
-        if test -z "$commondir" ; then
-                commondir="(system)"
-        fi
-        ac_cv_commondir=$commondir
-])
-
-dnl Options
-AM_MAINTAINER_MODE
+rootlibdir="/lib${libdir##*/lib}"
+usrlibdir="/usr/lib${libdir##*/lib}"
+usrsbindir="/usr/sbin${libdir##*/sbin}"
+
+full_sysconfdir=`eval eval eval eval eval echo "${sysconfdir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
+full_localstatedir=`eval eval eval eval eval echo "${localstatedir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
+
+AC_ARG_ENABLE(
+        [strict],
+        [AC_HELP_STRING([--enable-strict], [enable strict compile mode [[default=disabled]]])],
+        ,
+        [enable_strict="no"]
+)
+
+AC_ARG_ENABLE(
+        [pedantic],
+        [AC_HELP_STRING([--enable-pedantic], [enable pedantic compile mode [[desfault=disabled]]])],
+        ,
+        [enable_pedantic="no"]
+)
+
+AC_ARG_ENABLE(
+        [doc],
+        [AC_HELP_STRING([--enable-doc], [enable installation of documents. [[default=disabled]]])],
+        ,
+        [enable_doc="no"]
+)
+
+AC_ARG_ENABLE(
+        [api-doc],
+        [AC_HELP_STRING([--enable-api-doc], [enable generation and installation of api documents. [[default=disabled]]])],
+        ,
+        [enable_api_doc="no"]
+)
+
+AC_ARG_ENABLE(
+        [pcsc],
+        [AC_HELP_STRING([--enable-pcsc], [enable pcsc support. [[default=disabled]]])],
+        ,
+        [enable_pcsc="no"]
+)
+
+AC_ARG_ENABLE(
+        [usb],
+        [AC_HELP_STRING([--enable-usb], [enable usb support. [[default=disabled]]])],
+        ,
+        [enable_usb="no"]
+)
+
+AC_ARG_ENABLE(
+        [debug],
+        [AC_HELP_STRING([--enable-debug], [enable debug messages. [[default=no]]])],
+        [test "${enableval}" = "yes" && AC_DEFINE([DEBUG], [1], [Enable debug messages.])]
+)
+
+AC_ARG_ENABLE(
+        [sunray],
+        [AC_HELP_STRING([--enable-sunray], [enable sunray support. [[default=no]]])],
+        [test "${enableval}" = "yes" && AC_DEFINE([sunray], [1], [Enable sunray support.])]
+)
+
+AC_ARG_ENABLE(
+        [sunrayclient],
+        [AC_HELP_STRING([--enable-sunrayclient], [enable sunray client support. [[default=no]]])],
+        [test "${enableval}" = "yes" && AC_DEFINE(sunrayclient, 1, [Enable sunray client support.])]
+)
+
+AC_ARG_WITH(
+        [bundle-dir],
+        [AC_HELP_STRING([--with-bundle-dir=PATH], [install bundle file for pcsc-lite to PATH [[not installed]]])],
+        [
+                if test "${withval}" = "yes"; then
+                        bundledir="\$(libdir)"
+                else
+                        bundledir="${withval}"
+                fi
+        ],
+        [bundledir="no"]
+)
+
+AC_ARG_WITH(
+        [udev-dir],
+        [AC_HELP_STRING([--with-udev-dir=PATH], [install udev files into PATH [[not installed]]])],
+        [
+                if test "${withval}" = "yes"; then
+                        udevdir="\$(libdir)/udev"
+                else
+                        udevdir="${withval}"
+                fi
+        ],
+        [udevdir="no"]
+)
+
+AC_ARG_WITH(
+        [hotplug-dir],
+        [AC_HELP_STRING([--with-hotplug-dir=PATH], [install hotplug files into PATH [[not installed]]])],
+        [
+                if test "${withval}" = "yes"; then
+                        hotplugdir="\$(sysconfdir)/hotplug/usb"
+                else
+                        hotplugdir="${withval}"
+                fi
+        ],
+        [hotplugdir="no"]
+)
+
+AC_ARG_ENABLE(
+        [ifd-dir],
+        [AC_HELP_STRING([--with-ifd-dir], [ifd directory. [[default=/usr/lib/ifd]]])],
+        [ifddir="${withval}"],
+        [ifddir="${usrlibdir}/ifd"]
+)
 
 dnl Checks for programs.
@@ -103 +188 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AC_PROG_MKDIR_P
+AC_PROG_SED
 AC_PROG_MAKE_SET
-AM_PROG_LEX
-
-dnl Special check for pthread support.
-ACX_PTHREAD(
-[
- AC_DEFINE(HAVE_PTHREAD,1,
-  [Define if you have POSIX threads libraries and header files.])
-], [
- AC_MSG_ERROR([POSIX thread support required])
-])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
 
 dnl Add libtool support.
 AM_PROG_LIBTOOL
+
+AC_CHECK_PROGS([DOXYGEN],[doxygen])
+test "${enable_api_doc}" = "yes" -a -z "${DOXYGEN}" && AC_MSG_ERROR([doxygen is required for api doc])
+
+dnl These required for svn checkout
+AC_ARG_VAR([XSLTPROC], [xsltproc utility])
+AC_ARG_VAR([SVN], [subversion utility])
+AC_ARG_VAR([WGET], [wget utility])
+AC_ARG_VAR([WGET_OPTS], [wget options])
+AC_ARG_VAR([TR], [tr utility])
+AC_CHECK_PROGS([XSLTPROC],[xsltproc])
+AC_CHECK_PROGS([SVN],[svn])
+AC_CHECK_PROGS([WGET],[wget])
+AC_CHECK_PROGS([TR],[tr])
+test -z "${WGET_OPTS}" && WGET_OPTS="-nv"
+
+dnl svn checkout dependencies
+if test "${svn_checkout}" = "yes"; then
+        AC_MSG_CHECKING([XSLTPROC requirement])
+        if test -n "${XSLTPROC}"; then
+                AC_MSG_RESULT([ok])
+        else
+                if test "${enable_doc}" = "yes"; then
+                        AC_MSG_ERROR([Missing XSLTPROC svn build with doc])
+                else
+                        AC_MSG_WARN(["make dist" will not work])
+                fi
+        fi
+
+        AC_MSG_CHECKING([svn doc build dependencies])
+        if test -n "${SVN}" -a -n "${TR}" -a -n "${WGET}"; then
+                AC_MSG_RESULT([ok])
+        else
+                if test "${enable_doc}" = "yes"; then
+                        AC_MSG_ERROR([Missing SVN, TR or WGET for svn doc build])
+                else
+                        AC_MSG_WARN(["make dist" will not work])
+                fi
+        fi
+fi
 
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([errno.h fcntl.h malloc.h stdlib.h string.h strings.h sys/time.h unistd.h getopt.h dlfcn.h sys/poll.h])
+AC_CHECK_HEADERS([ \
+        errno.h fcntl.h malloc.h stdlib.h string.h \
+        strings.h sys/time.h unistd.h getopt.h \
+        dlfcn.h sys/poll.h
+])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -140 +258 @@
 dnl C Compiler features
 AC_C_INLINE
-if test "$GCC" = "yes"; then
-        CFLAGS="-Wall $CFLAGS"
-fi
-
-dnl use ltdl
+
+dnl See if socket() is found from libsocket
+AC_CHECK_LIB(
+        [socket],
+        [socket],
+        [
+                LIBS="${LIBS} -lsocket"
+                AC_CHECK_LIB(
+                        [resolv],
+                        [res_query],
+                        [LIBS="${LIBS} -lresolv"]
+                )
+        ]
+)
+
+AC_ARG_VAR([LTLIB_CFLAGS], [C compiler flags for libltdl])
+AC_ARG_VAR([LTLIB_LIBS], [linker flags for libltdl])
 if test -z "${LTLIB_LIBS}"; then
-    AC_ARG_VAR([LTLIB_CFLAGS], [C compiler flags for libltdl])
-    AC_ARG_VAR([LTLIB_LIBS], [linker flags for libltdl])
-
-    AC_CHECK_LIB(
-        [ltdl],
-        [lt_dlopen],
-        [LTLIB_LIBS="-lltdl"],
-        [AC_MSG_ERROR([ltdl1 not found, please install libltdl and/or libtool])])
-
-    AC_CHECK_HEADER(
-        [ltdl.h],
-        ,
-        [AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool])]
-    )
-fi
-AC_SUBST([LTLIB_CFLAGS])
-AC_SUBST([LTLIB_LIBS])
-
-dnl See if socket() is found from libsocket
-AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket" ac_cv_func_socket_in_lsocket=yes], ac_cv_func_socket_in_lsocket=no)
-
-AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
-                ac_cv_have_ss_family_in_struct_ss, [
-        AC_TRY_COMPILE(
+        AC_CHECK_LIB(
+                [ltdl],
+                [lt_dlopen],
+                [LTLIB_LIBS="-lltdl"],
+                [AC_MSG_ERROR([ltdl not found, please install libltdl and/or libtool])]
+        )
+fi
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
+AC_CHECK_HEADER(
+        [ltdl.h],
+        ,
+        [AC_MSG_ERROR([ltdl.h not found, please install libltdl and/or libtool])]
+)
+CFLAGS="${saved_CFLAGS}"
+
+AC_MSG_CHECKING([struct sockaddr_storage::ss_family])
+AC_TRY_COMPILE(
+        [
+#include <sys/types.h>
+#include <sys/socket.h>
+        ],
+        [
+struct sockaddr_storage s;
+s.ss_family = 1;
+        ],
+        [AC_MSG_RESULT([ok])],
+        [AC_TRY_COMPILE(
                 [
 #include <sys/types.h>
 #include <sys/socket.h>
                 ],
-                [ struct sockaddr_storage s; s.ss_family = 1; ],
-                [ ac_cv_have_ss_family_in_struct_ss="yes" ],
-                [ ac_cv_have_ss_family_in_struct_ss="no" ],
+                [
+struct sockaddr_storage s;
+s.__ss_family = 1;
+                ],
+                [
+                        AC_MSG_RESULT([hack])
+                        AC_DEFINE_UNQUOTED([ss_family], [__ss_family], [sockaddr_storage.ss_family wrapper])
+                ],
+ 

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
-archive
-acinclude.m4
-aclocal.m4
-autom4te.cache
-compile
-confdefs.h
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-conftest
-conftest.c
-depcomp
-install-sh
-libtool
-libtool.m4
-ltmain.sh
-missing
-mkinstalldirs
-so_locations
-stamp-h*
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+*.loT
+
+ChangeLog
+doxygen.conf
+reader.conf
+openct_serial
+openct.hald
+openct_usb
+openct_pcmcia
+init-script
+openct.conf
+types.h
+ifdhandler
+ifdproxy
+openct-tool
+openct-control

@@ +1 @@
+Makefile
+Makefile.in
+core
+archive
+acinclude.m4
+aclocal.m4
+autom4te.cache
+compile
+confdefs.h
+config.*
+configure
+conftest
+conftest.c
+depcomp
+install-sh
+libtool
+libtool.m4
+ltmain.sh
+missing
+mkinstalldirs
+so_locations
+stamp-h*
+
 .deps
 .libs
@@ -19 +42 @@
 *.rej
 *.u
+*.rc
+*.pc
 *~
-Makefile
-Makefile.in
-core
-gmon.out
+*.gz
+*.bz2
+*.[0-9]
+*.html
+*.gif
+*.css
+*.out
+*.loT
+
+ChangeLog
+doxygen.conf
+reader.conf
+openct_serial
+openct.hald
+openct_usb
+openct_pcmcia
+init-script
+openct.conf
+types.h
+ifdhandler
+ifdproxy
+openct-tool
+openct-control