Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / png / configure.ac

diff --git a/src/png/configure.ac b/src/png/configure.ac
index eaee00572d8dc90b20f1237f30c3124f0daa249a..510e4bc3b356f74566fa2f5d86449f907747d220 100644 (file)
--- a/src/png/configure.ac
+++ b/src/png/configure.ac
@@ -18,16 +18,16 @@ AC_PREREQ(2.59)
 
 dnl Version number stuff here:
 
 
 dnl Version number stuff here:
 

-AC_INIT([libpng], [1.2.34], [png-mng-implement@lists.sourceforge.net])
+PNGLIB_VERSION=1.4.4
+PNGLIB_MAJOR=1
+PNGLIB_MINOR=4
+PNGLIB_RELEASE=4
+
+AC_INIT([libpng], [1.4.4], [png-mng-implement@lists.sourceforge.net])

 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 
 AM_INIT_AUTOMAKE
 dnl stop configure from automagically running automake
 AM_MAINTAINER_MODE
 

-PNGLIB_VERSION=1.2.34
-PNGLIB_MAJOR=1
-PNGLIB_MINOR=2
-PNGLIB_RELEASE=34
-

 dnl End of version number stuff
 
 AC_CONFIG_SRCDIR([pngget.c])
 dnl End of version number stuff
 
 AC_CONFIG_SRCDIR([pngget.c])


@@ -38,11 +38,10 @@ AC_PROG_CC
 AC_PROG_LD
 AC_PROG_CPP
 AC_CHECK_TOOL(SED, sed, :)
 AC_PROG_LD
 AC_PROG_CPP
 AC_CHECK_TOOL(SED, sed, :)

-AC_LIBTOOL_WIN32_DLL

 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET

-AC_PROG_LIBTOOL
+LT_INIT([win32-dll])

 
 # Checks for header files.
 AC_HEADER_STDC
 
 # Checks for header files.
 AC_HEADER_STDC


@@ -59,21 +58,25 @@ AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc]))
 AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
 AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
 
 AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )
 AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))
 

-LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
-AC_MSG_CHECKING(
-  [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
-AC_TRY_COMPILE(
-  [#include "$srcdir/pnggccrd.c"],
-  [return 0;],
-  AC_MSG_RESULT(yes)
-  LIBPNG_NO_MMX="",
-  AC_MSG_RESULT(no)
-  LIBPNG_NO_MMX=-DPNG_NO_MMX_CODE)
-LIBPNG_DEFINES=$LIBPNG_DEFINES\ $LIBPNG_NO_MMX
+case $host_os in
+  aix*)
+   LIBPNG_DEFINES="-DPNG_CONFIGURE_LIBPNG -D_ALL_SOURCE";;
+  *)
+   LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG;;
+esac
+LIBPNG_DEFINES=$LIBPNG_DEFINES

 AC_SUBST(LIBPNG_DEFINES)
 AC_SUBST(LIBPNG_DEFINES)

-AC_SUBST(LIBPNG_NO_MMX)

 
 AC_MSG_CHECKING([if libraries can be versioned])
 
 AC_MSG_CHECKING([if libraries can be versioned])

+# Special case for PE/COFF platforms: ld reports
+# support for version-script, but doesn't actually
+# DO anything with it.
+case $host in
+*cygwin* | *mingw32* )
+    have_ld_version_script=no
+    AC_MSG_RESULT(no)
+;;
+* )

 GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
 if test "$GLD"; then
     have_ld_version_script=yes
 GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
 if test "$GLD"; then
     have_ld_version_script=yes


@@ -83,6 +86,9 @@ else
     AC_MSG_RESULT(no)
     AC_MSG_WARN(*** You have not enabled versioned symbols.)
 fi
     AC_MSG_RESULT(no)
     AC_MSG_WARN(*** You have not enabled versioned symbols.)
 fi

+;;
+esac
+

 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
 if test "$have_ld_version_script" = "yes"; then
 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
 if test "$have_ld_version_script" = "yes"; then


@@ -126,23 +132,9 @@ AC_ARG_WITH(binconfigs,
        [binconfigs='${binconfigs}'])
 AC_SUBST([binconfigs])
 
        [binconfigs='${binconfigs}'])
 AC_SUBST([binconfigs])
 

-# Allow the old version number library, libpng.so, to be removed from
-# the build
-AC_ARG_WITH(libpng-compat,
-       AC_HELP_STRING([--with-libpng-compat],
-               [Generate the obsolete libpng.so library @<:@default=yes@:>@]),
-       [if test "${withval}" = no; then
-               compatlib=
-               AC_MSG_NOTICE([libpng.so will not be built])
-       else
-               compatlib=libpng.la
-       fi],
-       [compatlib=libpng.la])
-AC_SUBST([compatlib])
-

 # Config files, substituting as above
 # Config files, substituting as above

-AC_CONFIG_FILES([Makefile libpng.pc:scripts/libpng.pc-configure.in])
-AC_CONFIG_FILES([libpng-config:scripts/libpng-config.in],
+AC_CONFIG_FILES([Makefile libpng.pc:libpng.pc.in])
+AC_CONFIG_FILES([libpng-config:libpng-config.in],

                [chmod +x libpng-config])
 
 AC_OUTPUT
                [chmod +x libpng-config])
 
 AC_OUTPUT