[Gnash-commit] gnash configure.ac macros/hashmap.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/25 18:30:18

Modified files:
        .              : configure.ac 
Removed files:
        macros         : hashmap.m4 

Log message:
        Inlined the function...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.205&r2=1.206
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/hashmap.m4?cvsroot=gnash&r1=1.4&r2=0

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -b -r1.205 -r1.206
--- configure.ac        25 Nov 2006 18:27:32 -0000      1.205
+++ configure.ac        25 Nov 2006 18:30:18 -0000      1.206
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.205 2006/11/25 18:27:32 nihilus Exp $
+dnl $Id: configure.ac,v 1.206 2006/11/25 18:30:18 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -446,7 +446,21 @@
 AC_CHECK_FUNCS(socket)
 AC_CHECK_FUNCS(CreateFileMappingA)
 
-GNASH_HASHMAP
+dnl GNASH_HASHMAP
+dnl Let's get rid of this small file and inline the function.
+
+AC_LANG_PUSH(C++)
+       AC_CHECK_HEADER(ext/hash_map, [
+               AC_DEFINE([GNU_HASH_MAP], [1], [Using GNU ext/hash_map.h])
+               AC_DEFINE([HASH_MAP_NS], [__gnu_cxx], [Using GNU __gnu_cxx::])
+       ], [
+               AC_CHECK_HEADER(hash_map, [
+                       AC_DEFINE([WIN32_HASH_MAP], [1], [Using Win32 
hash_map.h])
+                       AC_DEFINE([HASH_MAP_NS], [stdext], [Using win32 
stdext::])
+               ])
+       )
+AC_LANG_POP(C++)
+
 dnl AC_CHECK_LIB(c, mremap)
 GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
 GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)

Index: macros/hashmap.m4
===================================================================
RCS file: macros/hashmap.m4
diff -N macros/hashmap.m4
--- macros/hashmap.m4   29 Oct 2006 18:34:10 -0000      1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-dnl  
-dnl    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl  
-dnl  This program is free software; you can redistribute it and/or modify
-dnl  it under the terms of the GNU General Public License as published by
-dnl  the Free Software Foundation; either version 2 of the License, or
-dnl  (at your option) any later version.
-dnl  
-dnl  This program is distributed in the hope that it will be useful,
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl  GNU General Public License for more details.
-dnl  You should have received a copy of the GNU General Public License
-dnl  along with this program; if not, write to the Free Software
-dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-dnl  
-dnl 
-
-AC_DEFUN([GNASH_HASHMAP],
-[
-  AC_LANG_PUSH(C++)
-  AC_CHECK_HEADER(ext/hash_map, [
-    AC_DEFINE([GNU_HASH_MAP], [1], [Using GNU ext/hash_map.h])
-    AC_DEFINE([HASH_MAP_NS], [__gnu_cxx], [Using GNU __gnu_cxx::])
-    ], [
-    AC_CHECK_HEADER(hash_map, [
-      AC_DEFINE([WIN32_HASH_MAP], [1], [Using Win32 hash_map.h])
-      AC_DEFINE([HASH_MAP_NS], [stdext], [Using win32 stdext::])
-    ])
-  ])
-  AC_LANG_POP(C++)
-])
-