diff -ruN libprelude-0.8.10.orig/aclocal.m4 libprelude-0.8.10/aclocal.m4 --- libprelude-0.8.10.orig/aclocal.m4 2003-12-09 07:08:23 +0300 +++ libprelude-0.8.10/aclocal.m4 2004-12-20 01:14:40 +0300 @@ -3176,18 +3176,18 @@ # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE +#AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +#[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +# case $enable_ltdl_convenience in +# no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +# "") enable_ltdl_convenience=yes +# ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +# esac +# LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +# LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +# # For backwards non-gettext consistent compatibility... +# INCLTDL="$LTDLINCL" +#])# AC_LIBLTDL_CONVENIENCE # AC_LIBLTDL_INSTALLABLE([DIRECTORY]) diff -ruN libprelude-0.8.10.orig/configure.in libprelude-0.8.10/configure.in --- libprelude-0.8.10.orig/configure.in 2003-12-09 04:44:23 +0300 +++ libprelude-0.8.10/configure.in 2004-12-20 01:17:53 +0300 @@ -33,18 +33,11 @@ AM_MAINTAINER_MODE -dnl setup libltdl +dnl setup -AC_CONFIG_SUBDIRS(libltdl) AC_LIBTOOL_DLOPEN -AC_LIBLTDL_CONVENIENCE AM_PROG_LIBTOOL -AC_SUBST(INCLTDL) -AC_SUBST(LIBLTDL) - - - dnl Checks for programs. AC_PROG_CC @@ -64,6 +57,19 @@ AC_SUBST(libprelude_libs) AC_SUBST(libprelude_cflags) +dnl ************************************************** +dnl * Check for ltdl library and ltdl headers * +dnl ************************************************** +AC_CHECK_HEADERS(ltdl.h) + + if test $ac_cv_header_ltdl_h = no ; then + AC_MSG_ERROR([could not locate libtool ltdl.h]) + fi + +AC_CHECK_LIB(ltdl, lt_dlinit, [ + libprelude_libs="$libprelude_libs -lltdl" + AC_DEFINE(HAVE_LIBLTDL,1,[define this if you have libtool -ltdl]) +]) dnl ************************************************** dnl * Check for crypt library * diff -ruN libprelude-0.8.10.orig/Makefile.am libprelude-0.8.10/Makefile.am --- libprelude-0.8.10.orig/Makefile.am 2003-05-03 20:29:46 +0400 +++ libprelude-0.8.10/Makefile.am 2004-12-20 01:11:08 +0300 @@ -1,4 +1,4 @@ -SUBDIRS = libltdl src sensor-adduser docs +SUBDIRS = src sensor-adduser docs includedir=$(prefix)/libprelude/include include_HEADERS=config.h diff -ruN libprelude-0.8.10.orig/Makefile.in libprelude-0.8.10/Makefile.in --- libprelude-0.8.10.orig/Makefile.in 2003-12-09 07:08:29 +0300 +++ libprelude-0.8.10/Makefile.in 2004-12-20 01:12:18 +0300 @@ -85,7 +85,6 @@ GCJFLAGS = @GCJFLAGS@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ -INCLTDL = @INCLTDL@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBLTDL = @LIBLTDL@ @@ -108,7 +107,7 @@ sensors_config_dir = @sensors_config_dir@ sensors_ident_file = @sensors_ident_file@ sensors_spool_dir = @sensors_spool_dir@ -SUBDIRS = libltdl src sensor-adduser docs +SUBDIRS = src sensor-adduser docs include_HEADERS = config.h EXTRA_DIST = COPYING.OpenSSL sensors-default.conf diff -ruN libprelude-0.8.10.orig/src/Makefile.am libprelude-0.8.10/src/Makefile.am --- libprelude-0.8.10.orig/src/Makefile.am 2003-12-05 05:24:29 +0300 +++ libprelude-0.8.10/src/Makefile.am 2004-12-20 01:09:47 +0300 @@ -1,6 +1,6 @@ SUBDIRS = include DEFS = -DSENSORS_CONFIG_DIR=\"@sensors_config_dir@\" -DSENSORS_SPOOL_DIR=\"@sensors_spool_dir@\" -DSENSORS_IDENT_FILE=\"@sensors_ident_file@\" @libprelude_cflags@ @pthread_cflags@ -INCLUDES = -I$(top_srcdir) -I$(srcdir)/include @INCLTDL@ +INCLUDES = -I$(top_srcdir) -I$(srcdir)/include libpreludeincludedir = $(includedir)/ libprelude_la_LIBADD = @LIBLTDL@ diff -ruN libprelude-0.8.10.orig/src/Makefile.in libprelude-0.8.10/src/Makefile.in --- libprelude-0.8.10.orig/src/Makefile.in 2003-12-09 07:08:29 +0300 +++ libprelude-0.8.10/src/Makefile.in 2004-12-20 01:10:30 +0300 @@ -84,7 +84,6 @@ GCJFLAGS = @GCJFLAGS@ GTKDOC = @GTKDOC@ HTML_DIR = @HTML_DIR@ -INCLTDL = @INCLTDL@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBLTDL = @LIBLTDL@ @@ -109,7 +108,7 @@ sensors_spool_dir = @sensors_spool_dir@ SUBDIRS = include DEFS = -DSENSORS_CONFIG_DIR=\"@sensors_config_dir@\" -DSENSORS_SPOOL_DIR=\"@sensors_spool_dir@\" -DSENSORS_IDENT_FILE=\"@sensors_ident_file@\" @libprelude_cflags@ @pthread_cflags@ -INCLUDES = -I$(top_srcdir) -I$(srcdir)/include @INCLTDL@ +INCLUDES = -I$(top_srcdir) -I$(srcdir)/include libpreludeincludedir = $(includedir)/ libprelude_la_LIBADD = @LIBLTDL@