@@ -1,3 +1,10 @@

+Fri Dec 28 23:23:40 EET 2007 (edwin)

+------------------------------------

+  * configure, libclamav/Makefile.in/am : add ld version script support.

+       cl_ symbols are exported with a CLAMAV_PUBLIC version,

+       cli_ symbols with a CLAMAV_PRIVATE version.

+  * clamav-milter/Makefile.in/am: fix out-of-tree builds of manpage.

+

 Fri Dec 28 16:37:43 EET 2007 (edwin)

 ------------------------------------

   * configure, libclamav/str.[ch] : strcasestr() check and replacement.

@@ -35,7 +35,7 @@ clamav_milter_SOURCES = \

     $(top_srcdir)/shared/network.h \

     clamav-milter.c

-man_MANS = $(top_srcdir)/docs/man/clamav-milter.8

+man_MANS = $(top_builddir)/docs/man/clamav-milter.8

 endif

 endif

@@ -238,7 +238,7 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    $(top_srcdir)/shared/network.h \

 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@    clamav-milter.c

-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_srcdir)/docs/man/clamav-milter.8

+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_builddir)/docs/man/clamav-milter.8

 INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)

 EXTRA_DIST = clamav-milter.c INSTALL

 all: all-am

@@ -877,6 +877,8 @@ LIBTOOL

 MAINTAINER_MODE_TRUE

 MAINTAINER_MODE_FALSE

 MAINT

+VERSIONSCRIPT_TRUE

+VERSIONSCRIPT_FALSE

 sendmailprog

 DBDIR

 CFGDIR

@@ -4745,7 +4747,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 4748 "configure"' > conftest.$ac_ext

+  echo '#line 4750 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7482,11 +7484,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7485: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7487: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7489: \$? = $ac_status" >&5

+   echo "$as_me:7491: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -7772,11 +7774,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7775: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7777: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7779: \$? = $ac_status" >&5

+   echo "$as_me:7781: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -7876,11 +7878,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7879: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7881: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:7883: \$? = $ac_status" >&5

+   echo "$as_me:7885: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -10238,7 +10240,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 10241 "configure"

+#line 10243 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10338,7 +10340,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 10341 "configure"

+#line 10343 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -12758,11 +12760,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:12761: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:12763: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:12765: \$? = $ac_status" >&5

+   echo "$as_me:12767: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -12862,11 +12864,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:12865: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:12867: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:12869: \$? = $ac_status" >&5

+   echo "$as_me:12871: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -14439,11 +14441,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:14442: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:14444: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:14446: \$? = $ac_status" >&5

+   echo "$as_me:14448: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -14543,11 +14545,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:14546: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:14548: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:14550: \$? = $ac_status" >&5

+   echo "$as_me:14552: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -16743,11 +16745,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:16746: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:16748: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:16750: \$? = $ac_status" >&5

+   echo "$as_me:16752: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -17033,11 +17035,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:17036: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:17038: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:17040: \$? = $ac_status" >&5

+   echo "$as_me:17042: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -17137,11 +17139,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:17140: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:17142: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:17144: \$? = $ac_status" >&5

+   echo "$as_me:17146: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -22078,6 +22080,58 @@ echo "${ECHO_T}$ZLIB_HOME" >&6; }

 fi

+{ echo "$as_me:$LINENO: checking for ld --version-script" >&5

+echo $ECHO_N "checking for ld --version-script... $ECHO_C" >&6; }

+if test "${ac_cv_ld_version_script+set}" = set; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+    cat > conftest.c <<EOF

+void cl_symbol1(void) {}

+void cli_symbol2(void) {}

+EOF

+  cat > conftest.map <<EOF

+RELEASE

+{

+	global:

+		cl_*;

+	local:

+		*;

+};

+PRIVATE

+{

+	global:

+		cli_*;

+	local:

+		*;

+};

+EOF

+  if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared

+				-o conftest.so conftest.c

+				-Wl,--version-script,conftest.map

+		       1>&5'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; };

+  then

+      ac_cv_ld_version_script=yes

+  else

+      ac_cv_ld_version_script=no

+  fi

+ rm -f conftest*

+fi

+{ echo "$as_me:$LINENO: result: $ac_cv_ld_version_script" >&5

+echo "${ECHO_T}$ac_cv_ld_version_script" >&6; }

+ if test "x$ac_cv_ld_version_script" = "xyes"; then

+  VERSIONSCRIPT_TRUE=

+  VERSIONSCRIPT_FALSE='#'

+else

+  VERSIONSCRIPT_TRUE='#'

+  VERSIONSCRIPT_FALSE=

+fi

+

+

 # Check whether --enable-zlib-vcheck was given.

 if test "${enable_zlib_vcheck+set}" = set; then

   enableval=$enable_zlib_vcheck; zlib_check=$enableval

@@ -26524,6 +26578,13 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.

 Usually this means the macro was only invoked conditionally." >&2;}

    { (exit 1); exit 1; }; }

 fi

+if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then

+  { { echo "$as_me:$LINENO: error: conditional \"VERSIONSCRIPT\" was never defined.

+Usually this means the macro was only invoked conditionally." >&5

+echo "$as_me: error: conditional \"VERSIONSCRIPT\" was never defined.

+Usually this means the macro was only invoked conditionally." >&2;}

+   { (exit 1); exit 1; }; }

+fi

 if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then

   { { echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined.

 Usually this means the macro was only invoked conditionally." >&5

@@ -27253,6 +27314,8 @@ LIBTOOL!$LIBTOOL$ac_delim

 MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim

 MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim

 MAINT!$MAINT$ac_delim

+VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim

+VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim

 sendmailprog!$sendmailprog$ac_delim

 DBDIR!$DBDIR$ac_delim

 CFGDIR!$CFGDIR$ac_delim

@@ -27275,7 +27338,7 @@ LIBOBJS!$LIBOBJS$ac_delim

 LTLIBOBJS!$LTLIBOBJS$ac_delim

 _ACEOF

-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then

+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then

     break

   elif $ac_last_try; then

     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

@@ -254,6 +254,39 @@ fi

 AC_MSG_RESULT($ZLIB_HOME)

 ])

+AC_CACHE_CHECK([for ld --version-script], [ac_cv_ld_version_script], [dnl

+  cat > conftest.c <<EOF

+void cl_symbol1(void) {}

+void cli_symbol2(void) {}

+EOF

+  cat > conftest.map <<EOF

+RELEASE

+{

+	global:

+		cl_*;

+	local:

+		*;

+};

+PRIVATE

+{

+	global:

+		cli_*;

+	local:

+		*;

+};

+EOF

+  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared

+				-o conftest.so conftest.c

+				-Wl,--version-script,conftest.map

+		       1>&AS_MESSAGE_LOG_FD]);

+  then

+      ac_cv_ld_version_script=yes

+  else

+      ac_cv_ld_version_script=no

+  fi

+ rm -f conftest*])

+AM_CONDITIONAL(VERSIONSCRIPT, test "x$ac_cv_ld_version_script" = "xyes")

+

 AC_ARG_ENABLE(zlib-vcheck,

 [  --disable-zlib-vcheck	  do not check for buggy zlib version ],

 zlib_check=$enableval, zlib_check="yes")

@@ -28,6 +28,10 @@ endif

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

+if VERSIONSCRIPT

+libclamav_la_LDFLAGS += -Wl,--version-script=@top_srcdir@/libclamav/libclamav.map

+endif

+

 include_HEADERS = clamav.h

 libclamav_la_SOURCES = \

@@ -176,7 +180,17 @@ libclamav_la_SOURCES = \

 	dconf.c \

 	dconf.h \

 	lzma_iface.c \

-	lzma_iface.h

+	lzma_iface.h \

+	libclamav.map

+

+libclamav_internal_utils_la_SOURCES=str.c \

+				    str.h \

+				    others.c \

+				    others.h \

+				    md5.c \

+				    md5.h

+

+libclamav_internal_utils_la_LDFLAGS=-static

-lib_LTLIBRARIES = libclamav.la

+lib_LTLIBRARIES = libclamav.la libclamav_internal_utils.la

 EXTRA_DIST = regex/engine.c

@@ -52,6 +52,7 @@ POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

+@VERSIONSCRIPT_TRUE@am__append_1 = -Wl,--version-script=@top_srcdir@/libclamav/libclamav.map

 subdir = libclamav

 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \

 	$(srcdir)/Makefile.in

@@ -92,6 +93,14 @@ libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)

 libclamav_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

 	$(libclamav_la_LDFLAGS) $(LDFLAGS) -o $@

+libclamav_internal_utils_la_LIBADD =

+am_libclamav_internal_utils_la_OBJECTS = str.lo others.lo md5.lo

+libclamav_internal_utils_la_OBJECTS =  \

+	$(am_libclamav_internal_utils_la_OBJECTS)

+libclamav_internal_utils_la_LINK = $(LIBTOOL) --tag=CC \

+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \

+	$(AM_CFLAGS) $(CFLAGS) $(libclamav_internal_utils_la_LDFLAGS) \

+	$(LDFLAGS) -o $@

 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

 depcomp = $(SHELL) $(top_srcdir)/depcomp

 am__depfiles_maybe = depfiles

@@ -104,8 +113,10 @@ CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

 	$(LDFLAGS) -o $@

-SOURCES = $(libclamav_la_SOURCES)

-DIST_SOURCES = $(libclamav_la_SOURCES)

+SOURCES = $(libclamav_la_SOURCES) \

+	$(libclamav_internal_utils_la_SOURCES)

+DIST_SOURCES = $(libclamav_la_SOURCES) \

+	$(libclamav_internal_utils_la_SOURCES)

 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

 	html-recursive info-recursive install-data-recursive \

 	install-dvi-recursive install-exec-recursive \

@@ -249,7 +260,8 @@ SUBDIRS = lzma .

 INCLUDES = -I$(top_srcdir) -I@srcdir@/nsis -I@srcdir@/lzma

 @ENABLE_UNRAR_FALSE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la

 @ENABLE_UNRAR_TRUE@libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@ lzma/liblzma.la $(top_builddir)/libclamunrar_iface/libclamunrar_iface.la

-libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

+libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \

+	-no-undefined $(am__append_1)

 include_HEADERS = clamav.h

 libclamav_la_SOURCES = \

 	clamav.h \

@@ -397,9 +409,18 @@ libclamav_la_SOURCES = \

 	dconf.c \

 	dconf.h \

 	lzma_iface.c \

-	lzma_iface.h

-

-lib_LTLIBRARIES = libclamav.la

+	lzma_iface.h \

+	libclamav.map

+

+libclamav_internal_utils_la_SOURCES = str.c \

+				    str.h \

+				    others.c \

+				    others.h \

+				    md5.c \

+				    md5.h

+

+libclamav_internal_utils_la_LDFLAGS = -static

+lib_LTLIBRARIES = libclamav.la libclamav_internal_utils.la

 EXTRA_DIST = regex/engine.c

 all: all-recursive

@@ -463,6 +484,8 @@ clean-libLTLIBRARIES:

 	done

 libclamav.la: $(libclamav_la_OBJECTS) $(libclamav_la_DEPENDENCIES) 

 	$(libclamav_la_LINK) -rpath $(libdir) $(libclamav_la_OBJECTS) $(libclamav_la_LIBADD) $(LIBS)

+libclamav_internal_utils.la: $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_DEPENDENCIES) 

+	$(libclamav_internal_utils_la_LINK) -rpath $(libdir) $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_LIBADD) $(LIBS)

 mostlyclean-compile:

 	-rm -f *.$(OBJEXT)