cvs: gd(GD_2_0) /libgd Makefile.am configure.ac
[email protected] ("Pierre-Alain Joye")
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1170465310@cvsserver> |
pajoye Sat Feb 3 01:15:10 2007 UTC
Modified files: (Branch: GD_2_0)
/gd/libgd Makefile.am configure.ac
Log:
- #31 Shared library support on cygwin (Dr. Volker Zell)
http://cvs.php.net/viewvc.cgi/gd/libgd/Makefile.am?r1=1.8&r2=1.8.2.1&diff_format=u
Index: gd/libgd/Makefile.am
diff -u gd/libgd/Makefile.am:1.8 gd/libgd/Makefile.am:1.8.2.1
--- gd/libgd/Makefile.am:1.8 Mon Oct 9 14:22:22 2006
+++ gd/libgd/Makefile.am Sat Feb 3 01:15:10 2007
@@ -19,7 +19,9 @@
libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
-libgd_la_LDFLAGS = -version-info 2:0:0
+libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS)
+
+libgd_la_LIBADD = $(LTLIBICONV)
LDADD = ./libgd.la $(LIBICONV)
http://cvs.php.net/viewvc.cgi/gd/libgd/configure.ac?r1=1.32&r2=1.32.2.1&diff_format=u
Index: gd/libgd/configure.ac
diff -u gd/libgd/configure.ac:1.32 gd/libgd/configure.ac:1.32.2.1
--- gd/libgd/configure.ac:1.32 Sat Jan 6 13:48:58 2007
+++ gd/libgd/configure.ac Sat Feb 3 01:15:10 2007
@@ -4,10 +4,11 @@
#
AC_PREREQ(2.54)
-#HEY! Change BOTH the vesion number and the GDLIB_REVISION setting!
+#HEY! Change BOTH the version number and the GDLIB_REVISION setting!
AC_INIT([GD], [2.0.34], [http://bugs.libgd.org])
AC_CONFIG_SRCDIR([gd.c])
AC_CONFIG_AUX_DIR(config)
+AC_CANONICAL_TARGET([])
GDLIB_MAJOR=2
GDLIB_MINOR=0
@@ -27,6 +28,18 @@
AM_INIT_AUTOMAKE()
AC_CONFIG_HEADERS([config.h:config.hin])
+AC_MSG_CHECKING([if we are building a Cygwin target])
+case "$target" in
+ *-*-cygwin*) XTRA_LDFLAGS="-no-undefined"
+ os_cygwin=yes
+ ;;
+ *) XTRA_LDFLAGS=
+ os_cygwin=no
+ ;;
+esac
+AC_MSG_RESULT([$os_cygwin])
+AC_SUBST([XTRA_LDFLAGS])
+
AC_PROG_CC
AM_PROG_CC_STDC
AC_PROG_INSTALL