r22657 - gnucash/trunk - Move configure test to a more appropriate location
Geert Janssens
gjanssens at code.gnucash.org
Sat Dec 15 14:15:23 EST 2012
Author: gjanssens
Date: 2012-12-15 14:15:23 -0500 (Sat, 15 Dec 2012)
New Revision: 22657
Trac: http://svn.gnucash.org/trac/changeset/22657
Modified:
gnucash/trunk/configure.ac
Log:
Move configure test to a more appropriate location
And remove a reference in the comment to a no longer existing function
Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac 2012-12-15 19:15:14 UTC (rev 22656)
+++ gnucash/trunk/configure.ac 2012-12-15 19:15:23 UTC (rev 22657)
@@ -241,6 +241,29 @@
AC_CHECK_HEADERS(dirent.h dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h)
+# I'm sure we (used to?) require this in various places, so don't remove
+# this test unless you've done sufficient code review/testing.
+AC_MSG_CHECKING(if unsigned long is at least as big as guint32)
+GNC_OLDCFLAGS="$CFLAGS"
+GNC_OLDLDFLAGS="$LDFLAGS"
+CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
+LDFLAGS="${LDFLAGS} ${GLIB_LIBS}"
+AC_TRY_RUN([
+ #include <glib.h>
+ int main(int argc, char *argv[]) {
+ return(!(sizeof(unsigned long) >= sizeof(guint32)));
+ }
+],[
+ AC_MSG_RESULT(yes)
+],[
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(cannot continue, size of unsigned long too small.)
+],[
+ AC_MSG_RESULT(assuming yes)
+])
+CFLAGS="$GNC_OLDCFLAGS"
+LDFLAGS="$GNC_OLDLDFLAGS"
+
# Gnucash replaced dlopen/dlsym by the g_module functions; dlsym
# is needed optionally in one place for BSD linkers, though.
DL_LIB=
@@ -400,30 +423,6 @@
AC_SUBST(GUILE_LIBS)
AC_SUBST(GUILE)
-# One of the places this is critical is in gnc_scm_to_gint64 and inverse.
-# However, I'm sure we require this elsewhere, so don't remove this test
-# unless you've done sufficient code review/testing.
-AC_MSG_CHECKING(if unsigned long is at least as big as guint32)
-GNC_OLDCFLAGS="$CFLAGS"
-GNC_OLDLDFLAGS="$LDFLAGS"
-CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
-LDFLAGS="${LDFLAGS} ${GLIB_LIBS}"
-AC_TRY_RUN([
- #include <glib.h>
- int main(int argc, char *argv[]) {
- return(!(sizeof(unsigned long) >= sizeof(guint32)));
- }
-],[
- AC_MSG_RESULT(yes)
-],[
- AC_MSG_RESULT(no)
- AC_MSG_ERROR(cannot continue, size of unsigned long too small.)
-],[
- AC_MSG_RESULT(assuming yes)
-])
-CFLAGS="$GNC_OLDCFLAGS"
-LDFLAGS="$GNC_OLDLDFLAGS"
-
### --------------------------------------------------------------------------
### See if we need guile-www
More information about the gnucash-changes
mailing list