[Wesnoth-cvs-commits] wesnoth changelog configure.ac

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/07/18 18:59:08

Modified files:
        .              : changelog configure.ac 

Log message:
        fix libpng not being detected on NetBSD (#13808)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.793&tr2=1.794&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.157&tr2=1.158&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.793 wesnoth/changelog:1.794
--- wesnoth/changelog:1.793     Mon Jul 18 11:54:41 2005
+++ wesnoth/changelog   Mon Jul 18 18:59:08 2005
@@ -5,6 +5,7 @@
         Swedish, Turkish
    * fixed help description of income and upkeep (#13565)
    * updated several unit descriptions
+   * standardized on "magi" as plural of "mage"
    * document that Woses receive no traits (#13630)
    * replay suggested save game now translated (#13558)
    * fixed some typos (#13714,#13715,#13716,#13717,#13718)
@@ -33,6 +34,7 @@
      * made campaign easier on "Easy" level
    * Eastern Invasion:
      * revised Approaching Weldyn for quicker gameplay
+     * tweaked Undead Crossing
    * The Dark Hordes:
      * cleaned up old id tags; added portraits for Tanar, Nati and Gwiti
  * server now supports redirection based on client version number
@@ -41,7 +43,12 @@
    * relocated and enlarged the buttons (#11967)
    * maps can't be saved with illegal characters (#10704)
    * replaced the buttons under the minimap with a toolbar
- * added quotes to configure.ac (forum thread 6747)
+ * build process
+   * added quotes to configure.ac (forum thread 6747)
+   * new utility extractsources to extract lists of sources from Makefile.am
+   * new utility makemam to construct Makefile.am from Makefile.am.in and
+     files containing lists of sources
+   * fix libpng not being detected on NetBSD (#13808)
  * various bug fixes and code cleanups
 
 Version 0.9.3:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.157 wesnoth/configure.ac:1.158
--- wesnoth/configure.ac:1.157  Mon Jul 18 11:54:41 2005
+++ wesnoth/configure.ac        Mon Jul 18 18:59:08 2005
@@ -37,7 +37,7 @@
 EOF
 ])
 
-AC_REVISION([$Revision: 1.157 $])
+AC_REVISION([$Revision: 1.158 $])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([src/actions.cpp])
@@ -287,8 +287,15 @@
 AC_PATH_PROGS([PNG_CONFIG], [libpng-config libpng12-config], [none])
 
 if test "x$PNG_CONFIG" = "xnone"; then
-    pngfound=no
-    AC_MSG_WARN([*** LIBPNG not found.])
+    AC_PATH_PROG([PNG_CONFIG], [pkg-config], [none])
+    if test "x$PNG_CONFIG" = "xnone"; then
+       pngfound=no
+       AC_MSG_WARN([*** LIBPNG not found.])
+    else
+       pngfound=yes
+       PNG_CFLAGS=`$PNG_CONFIG --cflags libpng12`
+       PNG_LIBS=`$PNG_CONFIG --libs libpng12`
+    fi
 else
     pngfound=yes
     PNG_CFLAGS=`$PNG_CONFIG --cflags`