@@ -1,7 +1,7 @@
 AC_REVISION($Revision $)
-AC_INIT(libconfig, 0.1.8)
+AC_INIT(libconfig, 0.1.12)
 AC_CONFIG_HEADER(config.h)
 
 dnl Find out about the host OS
 DC_CHK_OS_INFO
 
@@ -12,27 +12,36 @@
 AC_PROG_LN_S
 AC_PROG_RANLIB
 AC_AIX
 AC_CHECK_TOOL(AR, ar, true)
 
-AC_CHECK_HEADERS(ctype.h dirent.h pwd.h stdio.h stdlib.h string.h sys/stat.h sys/time.h sys/types.h time.h unistd.h)
-AC_HEADER_TIME
-
 DC_DO_TYPE(uint64_t, unsigned, 8)
 DC_DO_TYPE(int64_t, signed, 8)
 DC_DO_TYPE(uint32_t, unsigned, 4)
 DC_DO_TYPE(int32_t, signed, 4)
 DC_DO_TYPE(uint16_t, unsigned, 2)
 DC_DO_TYPE(int16_t, signed, 2)
 
-AC_REPLACE_FUNCS(strsep strtoll getuid)
-AC_CHECK_FUNCS(getpwuid)
-
+dnl Use opennet if it's available
 DC_ASK_OPTLIB(opennet, fopen_net, opennet.h, [      Enable opennet support], libopennet, HAVE_LIBOPENNET, HAVE_OPENNET_H)
 
 dnl Checks for Win32 specific things.
 DC_DO_WIN32
 
-dnl This must be last.
+dnl Get shared objects flags, calls DC_SYNC_SHLIBOBJS but if libobjs is
+dnl changed later (by AC_REPLACE_FUNCS, for example) you must call
+dnl DC_SYNC_SHLIBOBJS again.
 DC_GET_SHOBJFLAGS
+
+dnl This stuff has to come after the shobjtest to verify that it is correct
+AC_CHECK_HEADERS(ctype.h dirent.h pwd.h stdio.h stdlib.h string.h sys/stat.h sys/time.h sys/types.h time.h unistd.h)
+AC_HEADER_TIME
+
+AC_REPLACE_FUNCS(strsep strtoll getuid)
+AC_CHECK_FUNCS(getpwuid)
+
+dnl This MUST be last.
+DC_SYNC_SHLIBOBJS
+
+AC_CHECK_FUNCS(getpwuid)
 
 AC_OUTPUT(Makefile lc_geterrno.3 lc_process.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3 lc_cleanup.3 lc_process_file.3 libconfig.3)