Create unixodbc_conf without needing to execute a binary

git-svn-id: svn+ssh://svn.code.sf.net/p/unixodbc/code/trunk@30 ab163d8d-7830-4be3-ba5a-e01213c9a3c2

ChangeLog

@@ -16,6 +16,7 @@
     * Fix potential buffer overrun when using SAFEFILE
     * Fix mutex problem in the exit from __SQLGetInfo (thanks Richard)
     * Allow getting SQL_DM_VER via SQLGetInfo before connecting to a driver
+    * Generate unixodbc_conf.h using macros to allow cross compiling
 
 20th-April-2010
 2.3.0

Makefile.am

@@ -40,4 +40,4 @@ install-data-am:
 	-touch $(DESTDIR)${sysconfdir}/odbcinst.ini
 	-touch $(DESTDIR)${sysconfdir}/odbc.ini
 	-mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources
-	$(DESTDIR)${bindir}/odbc_config --header > $(DESTDIR)${includedir}/unixodbc_conf.h
+	cp unixodbc_conf.h $(DESTDIR)${includedir}/unixodbc_conf.h

configure.in

@@ -500,6 +500,7 @@ LIB_VERSION="1:0:0"
 AC_SUBST(LIB_VERSION)
 
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_HEADERS(unixodbc_conf.h)
 
 AC_OUTPUT( Makefile \
     extras/Makefile \
@@ -541,5 +542,5 @@ AC_OUTPUT( Makefile \
     )
 
 dnl Attempt to add version information to libraries generated by libtool
-sed '/archive_expsym_cmds=/s/{ global/VERS_3.52 {global/' < libtool > libtool.tmp; mv libtool.tmp libtool
+dnl sed '/archive_expsym_cmds=/s/{ global/VERS_3.52 {global/' < libtool > libtool.tmp; mv libtool.tmp libtool
 

unixodbc_conf.h.in

@@ -0,0 +1,29 @@
+#undef HAVE_UNISTD_H
+
+#undef HAVE_PWD_H
+
+#undef HAVE_SYS_TIME_H
+
+#undef ODBC_STD
+
+#undef UNICODE
+
+#undef GUID_DEFINED
+
+#undef SQL_WCHART_CONVERT
+
+#undef HAVE_LONG_LONG
+
+#undef ODBCINT64_TYPEA
+
+#undef UODBCINT64_TYPE
+
+#undef DISABLE_INI_CACHING
+
+#undef SIZEOF_LONG_INT
+
+#undef ALLREADY_HAVE_WINDOWS_TYPE
+
+#undef DONT_TD_VOID
+
+#undef DO_YOU_KNOW_WHAT_YOUR_ARE_DOING