head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.4
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.2
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2012Q2:1.4.0.16
	pkgsrc-2012Q2-base:1.4
	pkgsrc-2012Q1:1.4.0.14
	pkgsrc-2012Q1-base:1.4
	pkgsrc-2011Q4:1.4.0.12
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q3:1.4.0.10
	pkgsrc-2011Q3-base:1.4
	pkgsrc-2011Q2:1.4.0.8
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2011Q1:1.4.0.6
	pkgsrc-2011Q1-base:1.4
	pkgsrc-2010Q4:1.4.0.4
	pkgsrc-2010Q4-base:1.4
	pkgsrc-2010Q3:1.4.0.2
	pkgsrc-2010Q3-base:1.4
	pkgsrc-2010Q2:1.3.0.24
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.22
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.20
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.18
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.16
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.14
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.12
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.10
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.8
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.6
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.4
	pkgsrc-2008Q1:1.3.0.2
	pkgsrc-2008Q1-base:1.3;
locks; strict;
comment	@# @;


1.5
date	2012.08.12.16.28.06;	author wiz;	state dead;
branches;
next	1.4;

1.4
date	2010.09.23.07.07.47;	author adam;	state Exp;
branches;
next	1.3;

1.3
date	2008.03.04.09.22.27;	author wiz;	state Exp;
branches;
next	1.2;

1.2
date	2008.01.31.21.46.43;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2008.01.15.22.56.57;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Update to 0.27:

pkg-config 0.27
===

 - Drop usage of popt for equivalent API in glib2.
 - Add back an internal snapshot of glib2 to break circular dependency.
   This can be used by passing --with-internal-glib to configure. On
   Windows it may still be required to use an installed glib.
 - Fix --exists to check for Requires and Requires.private. This ensures
   that all necessary packages are installed prior to using --cflags,
   --libs, etc.
 - Various fixes for MinGW which should allow it to be used unpatched on
   that system.
 - New autoconf macros PKG_INSTALLDIR and PKG_NOARCH_INSTALLDIR to help
   determine the .pc file install directory.
 - Fix handling of --exact/atleast/max-version vs. =/>=/<=.
 - Fix errors in man page source.
 - Ensure testing only searches in the check directory.
 - Bump glib requirement to 2.16 to avoid deprecated
   g_win32_get_package_installation_subdirectory().
 - Autotools refresh and update. The required versions now are
   autoconf-2.62, automake-1.11 and libtool-2.2.
 - Use g_alloca from glib instead of figuring out alloca ourselves.
 - Remove search for setresuid & setreuid only needed for internal popt.
 - Bugs fixed: 833, 2458, 5214, 5326, 5703, 6074, 8653, 9135, 9143,
   9584, 10652, 11464, 14396, 17053, 23922, 28776, 29011, 29801, 31699,
   31700, 32622, 34382, 37266, 39646, 41081, 43149, 44843, 45599, 45742,
   48743

pkg-config 0.26
===

 - Build system fixes
 - More tests
 - pkg.m4 fixups which makes autoconf 2.66 happier.
 - Drop support for legacy -config scripts.  Those should already be
   gone and cause problems in cross-compilation environments.
 - Drop embedded glib
 - Fix up pkg.m4 to handle the case of --exists working and --cflags
   or --libs failing.
 - Various documentation updates
 - Allow $() through without escaping it.
 - Add --with-system-include-path instead of hard-coding
   /usr/include.
@
text
@$NetBSD: patch-ca,v 1.4 2010/09/23 07:07:47 adam Exp $

--- glib-1.2.10/configure.orig	2010-09-23 06:52:13.000000000 +0000
+++ glib-1.2.10/configure
@@@@ -12186,61 +12186,6 @@@@ if test "x$GCC" = "xyes"; then
   fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags to get ANSI library prototypes" >&5
-$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; }
-glib_save_LIBS=$LIBS
-LIBS="$LIBS -lm"
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <math.h>
-             int main (void) { return (log(1) != log(1.)); }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; }
-else
-  glib_save_CFLAGS=$CFLAGS
-     CFLAGS="$CFLAGS -std1"
-     if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <math.h>
-                 int main (void) { return (log(1) != log(1.)); }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: -std1" >&5
-$as_echo "-std1" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-         CFLAGS=$glib_save_CFLAGS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5
-$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;}
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-LIBS=$glib_save_LIBS
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags for POSIX compliance" >&5
 $as_echo_n "checking for extra flags for POSIX compliance... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@@@ -12726,30 +12671,18 @@@@ if test "${glib_cv_has__inline+set}" = s
   $as_echo_n "(cached) " >&6
 else
 
-        if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	__inline int foo () { return 0; }
 	int main () { return foo (); }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   glib_cv_has__inline=yes
-
-else
-  glib_cv_has__inline=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	glib_cv_has__inline=no
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@@@ -12765,30 +12698,18 @@@@ if test "${glib_cv_has__inline__+set}" =
   $as_echo_n "(cached) " >&6
 else
 
-        if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	__inline__ int foo () { return 0; }
 	int main () { return foo (); }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   glib_cv_has__inline__=yes
-
-else
-  glib_cv_has__inline__=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	glib_cv_has__inline__=no
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@@@ -12804,30 +12725,18 @@@@ if test "${glib_cv_hasinline+set}" = set
   $as_echo_n "(cached) " >&6
 else
 
-        if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	inline int foo () { return 0; }
 	int main () { return foo (); }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  glib_cv_hasinline=yes
-
-else
-  glib_cv_hasinline=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"; then :
+  glib_cv_has_inline=yes
+	glib_cv_has_inline=no
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@@@ -13541,13 +13450,7 @@@@ if test "${glib_cv_va_copy+set}" = set; 
   $as_echo_n "(cached) " >&6
 else
 
-	if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <stdarg.h>
@@@@ -13559,22 +13462,21 @@@@ else
 	  exit (1);
 	va_end (args1); va_end (args2);
 	}
-	int main() {
-	  f (0, 42);
-	  return 0;
-	}
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   glib_cv_va_copy=yes
-
 else
   glib_cv_va_copy=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@@@ -13586,13 +13488,7 @@@@ if test "${glib_cv___va_copy+set}" = set
   $as_echo_n "(cached) " >&6
 else
 
-	if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <stdarg.h>
@@@@ -13604,22 +13500,21 @@@@ else
 	  exit (1);
 	va_end (args1); va_end (args2);
 	}
-	int main() {
-	  f (0, 42);
-	  return 0;
-	}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  glib_cv___va_copy=yes
 
-else
-  glib_cv___va_copy=no
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  glib_cv_va___copy=yes
+else
+  glib_cv_va___copy=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@@@ -13631,13 +13526,7 @@@@ if test "${glib_cv_va_val_copy+set}" = s
   $as_echo_n "(cached) " >&6
 else
 
-	if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <stdarg.h>
@@@@ -13649,22 +13538,21 @@@@ else
 	  exit (1);
 	va_end (args1); va_end (args2);
 	}
-	int main() {
-	  f (0, 42);
-	  return 0;
-	}
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   glib_cv_va_val_copy=yes
-
 else
   glib_cv_va_val_copy=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@@@ -14910,6 +14798,15 @@@@ _ACEOF
 
 
 
+if test "$cross_compiling" = yes; then
+	{ echo "#define GLIB_SYSDEF_POLLIN =1"
+	echo "#define GLIB_SYSDEF_POLLPRI =2"
+	echo "#define GLIB_SYSDEF_POLLOUT =4"
+	echo "#define GLIB_SYSDEF_POLLERR =8"
+	echo "#define GLIB_SYSDEF_POLLHUP =16"
+	echo "#define GLIB_SYSDEF_POLLNVAL =32"
+	} > glibconfig-sysdefs.h
+else
 glib_sysdefso="glibconfig-sysdefs.h"
 glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ 	]*//g'`
 if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
@@@@ -14974,7 +14871,7 @@@@ fi
 
 rm -f confrun.c
 
-
+fi
 
 
 ac_config_commands="$ac_config_commands default-1"
@


1.4
log
@Changes 0.25:
* 0.24 included a too strict whitespace/shell metacharacter filter
  leading to some legal characters like = and : being escaped in the
  output.  This has been fixed.
* when building with newer and external libpopt, it would be confused
  over being asked to split an empty string, leading to errors with
  packages that included empty fields in their .pc files.
* Make the COPYING file explicitly GPLv2.  The COPYING file in 0.24
  was inadvertently GPLv3 rather than the correct GPLv2.
* Minor changes to documentation

Changes 0.24:
* Fix up bug in PKG_CONFIG_SYSROOT handling which mangled non-I and
  non-L arguments
* Put /usr/lib/pkgconfig and /usr/share/pkgconfig into the default
  search path when no prefix is passed to configure.
* Portability fixes for Windows and NetBSD
* Various man page updates
* Add logging support to log how pkg-config is being called.
* Skip Requires.private unless we need them for Cflags
* Add a variable, pc_path to the compiled-in pkg-config package that
  you can query for the compiled-in PKG_CONFIG_PC_PATH.
* Various updates to pkg.m4.
* Update rpmvercmp with bugfixes from upstream.
* Add introductory guide to pkg-config, thanks to Dan Nicholson for
  the patch.
* Add listing of variables in a package
* Make it possible to use external popt.
* Add --print-provides and --print-requires(-private) options
* Add support for paths containing whitespace and shell metacharacters
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Update to 0.23:

 - Add support for setting sysroot through PKG_CONFIG_SYSROOT_DIR in
   the environment.
 - Update included glib to 1.2.10.
 - Other minor fixes, including a segfault.
@
text
@d1 1
a1 1
$NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
d3 1
a3 1
--- glib-1.2.10/configure.orig	2008-01-16 22:52:28.000000000 +0000
d5 1
a5 1
@@@@ -20561,119 +20561,6 @@@@ if test "x$GCC" = "xyes"; then
d9 2
a10 2
-{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5
-echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; }
d13 5
a17 6
-if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
d19 1
a19 5
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
d24 5
a28 29
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; }
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-glib_save_CFLAGS=$CFLAGS
d30 5
a34 6
-     if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
d36 1
a36 5
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
d41 6
a46 30
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: -std1" >&5
-echo "${ECHO_T}-std1" >&6; }
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
d48 2
a49 2
-         { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5
-echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;}
d52 2
a53 1
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
a56 1
-
d58 2
a59 1
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
a61 1
-
d64 5
a68 5
 { echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5
 echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
@@@@ -23768,14 +23655,7 @@@@ if test "${glib_cv_has__inline+set}" = s
   echo $ECHO_N "(cached) $ECHO_C" >&6
d71 11
a81 13
-        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@@@ -23786,41 +23666,33 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d85 2
a86 30
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
d89 6
a95 9
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-glib_cv_has__inline=no
 
a96 2
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
a97 1
 
d102 2
a103 2
@@@@ -23838,14 +23710,7 @@@@ if test "${glib_cv_has__inline__+set}" =
   echo $ECHO_N "(cached) $ECHO_C" >&6
d106 11
a116 13
-        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@@@ -23856,41 +23721,33 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d120 2
a121 30
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
d124 6
a130 9
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-glib_cv_has__inline__=no
 
a131 2
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
a132 1
 
d137 2
a138 2
@@@@ -23908,14 +23765,7 @@@@ if test "${glib_cv_hasinline+set}" = set
   echo $ECHO_N "(cached) $ECHO_C" >&6
d141 11
a151 13
-        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@@@ -23926,41 +23776,33 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d155 1
a155 26
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
d158 7
a164 4
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
a166 9
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-glib_cv_hasinline=no
 
a167 2
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
a168 1
 
d173 2
a174 2
@@@@ -26402,14 +26244,7 @@@@ if test "${glib_cv_va_copy+set}" = set; 
   echo $ECHO_N "(cached) $ECHO_C" >&6
d177 12
a188 13
-	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@@@ -26425,46 +26260,41 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d205 2
a206 30
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
d210 1
a210 7
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-glib_cv_va_copy=no
d213 2
a214 2
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+	glib_cv_va_copy=no
a215 1
 
d221 2
a222 2
@@@@ -26476,14 +26306,7 @@@@ if test "${glib_cv___va_copy+set}" = set
   echo $ECHO_N "(cached) $ECHO_C" >&6
d225 12
a236 13
-	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@@@ -26499,46 +26322,41 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d244 6
a249 1
+
d253 1
a253 1
+
d257 2
a258 33
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  glib_cv___va_copy=yes
-
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
d260 2
a261 10
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-glib_cv___va_copy=no
-
+	glib_cv_va___copy=no
d263 2
a264 1
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
a266 1
 
d271 2
a272 2
@@@@ -26550,14 +26368,7 @@@@ if test "${glib_cv_va_val_copy+set}" = s
   echo $ECHO_N "(cached) $ECHO_C" >&6
d275 12
a286 13
-	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
+	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@@@ -26573,46 +26384,41 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d303 2
a304 30
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
d308 1
a308 7
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-glib_cv_va_val_copy=no
d310 3
a312 1
+	glib_cv_va_val_copy=no
a313 2
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
a314 1
 
d319 1
a319 1
@@@@ -29031,6 +28837,15 @@@@ _ACEOF
d335 1
a335 1
@@@@ -29124,7 +28939,7 @@@@ fi
@


1.2
log
@Avoid duplicate main() in va_copy tests as reported by Dan McMahill.
@
text
@d1 1
a1 1
$NetBSD$
d3 3
a5 3
--- glib-1.2.8/configure.orig	2007-06-18 23:36:00.000000000 +0200
+++ glib-1.2.8/configure
@@@@ -20267,119 +20267,6 @@@@ if test "x$GCC" = "xyes"; then
d125 1
a125 1
@@@@ -23474,14 +23361,7 @@@@ if test "${glib_cv_has__inline+set}" = s
d141 1
a141 1
@@@@ -23492,41 +23372,33 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d196 1
a196 1
@@@@ -23544,14 +23416,7 @@@@ if test "${glib_cv_has__inline__+set}" =
d212 1
a212 1
@@@@ -23562,41 +23427,33 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d267 1
a267 1
@@@@ -23614,14 +23471,7 @@@@ if test "${glib_cv_hasinline+set}" = set
d283 1
a283 1
@@@@ -23632,41 +23482,33 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d339 1
a339 1
@@@@ -26108,14 +25950,7 @@@@ if test "${glib_cv_va_copy+set}" = set; 
d355 1
a355 1
@@@@ -26131,46 +25966,41 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d423 1
a423 1
@@@@ -26182,14 +26012,7 @@@@ if test "${glib_cv___va_copy+set}" = set
d439 1
a439 1
@@@@ -26205,46 +26028,41 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d508 1
a508 1
@@@@ -26256,14 +26074,7 @@@@ if test "${glib_cv_va_val_copy+set}" = s
d524 1
a524 1
@@@@ -26279,46 +26090,41 @@@@ cat >>conftest.$ac_ext <<_ACEOF
d592 1
a592 1
@@@@ -28655,6 +28461,15 @@@@ _ACEOF
d608 1
a608 1
@@@@ -28748,7 +28563,7 @@@@ fi
@


1.1
log
@Restore cross-compiling ability.
@
text
@d3 1
a3 1
--- glib-1.2.8/configure.orig	2008-01-15 23:25:54.000000000 +0100
d355 3
a357 3
@@@@ -26135,42 +25970,40 @@@@ cat >>conftest.$ac_ext <<_ACEOF
 	  f (0, 42);
 	  return 0;
d359 5
d423 1
a423 1
@@@@ -26182,14 +26015,7 @@@@ if test "${glib_cv___va_copy+set}" = set
d439 3
a441 3
@@@@ -26209,42 +26035,40 @@@@ cat >>conftest.$ac_ext <<_ACEOF
 	  f (0, 42);
 	  return 0;
d443 5
d508 1
a508 1
@@@@ -26256,14 +26080,7 @@@@ if test "${glib_cv_va_val_copy+set}" = s
d524 3
a526 3
@@@@ -26283,42 +26100,40 @@@@ cat >>conftest.$ac_ext <<_ACEOF
 	  f (0, 42);
 	  return 0;
d528 5
d592 1
a592 1
@@@@ -28655,6 +28470,15 @@@@ _ACEOF
d608 1
a608 1
@@@@ -28748,7 +28572,7 @@@@ fi
@