Finishing autoconf work, also fixed compilation error in publish.h

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@689 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 87 insertions, 2 deletions

diff --git a/pjlib/build/os-auto.mak.in b/pjlib/build/os-auto.mak.in
new file mode 100644
index 00000000..f441104c
--- /dev/null
+++ b/pjlib/build/os-auto.mak.in
@@ -0,0 +1,35 @@
+# @configure_input@
+
+#
+# PJLIB_OBJS specified here are object files to be included in PJLIB
+# (the library) for this specific operating system. Object files common 
+# to all operating systems should go in Makefile instead.
+#
+export PJLIB_OBJS += 	addr_resolv_sock.o guid_simple.o \
+			log_writer_stdout.o os_core_unix.o \
+			os_error_unix.o os_time_unix.o \
+			os_timestamp_common.o os_timestamp_posix.o \
+			pool_policy_malloc.o sock_bsd.o sock_select.o
+
+export PJLIB_OBJS += ioqueue_select.o 
+export PJLIB_OBJS += file_access_unistd.o file_io_ansi.o
+
+#
+# TEST_OBJS are operating system specific object files to be included in
+# the test application.
+#
+export TEST_OBJS +=	@ac_main_obj@
+
+#
+# Additional LDFLAGS for pjlib-test
+#
+export TEST_LDFLAGS += @LDFLAGS@ @LIBS@
+
+#
+# TARGETS are make targets in the Makefile, to be executed for this given
+# operating system.
+#
+export TARGETS	    =	pjlib pjlib-test
+
+
+
diff --git a/pjlib/include/pj/compat/m_auto.h.in b/pjlib/include/pj/compat/m_auto.h.in
new file mode 100644
index 00000000..c429019b
--- /dev/null
+++ b/pjlib/include/pj/compat/m_auto.h.in
@@ -0,0 +1,38 @@
+/* $Id$ */
+/* 
+ * Copyright (C)2003-2006 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#ifndef __PJ_COMPAT_M_AUTO_H__
+#define __PJ_COMPAT_M_AUTO_H__
+
+/**
+ * @file m_auto.h
+ * @brief Automatically generated process definition file.
+ */
+
+#undef PJ_M_NAME
+
+#undef PJ_IS_LITTLE_ENDIAN
+#undef PJ_IS_BIG_ENDIAN
+
+/* Specify if floating point is present/desired */
+#undef PJ_HAS_FLOATING_POINT
+
+/* Deprecated */
+#define PJ_HAS_PENTIUM		0
+
+#endif	/* __PJ_COMPAT_M_AUTO_H__ */
diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
index 0ceb863e..71bf37c3 100644
--- a/pjlib/include/pj/config.h
+++ b/pjlib/include/pj/config.h
@@ -39,7 +39,13 @@
 /********************************************************************
  * Include target OS specific configuration.
  */
-#if defined(PJ_WIN32_WINCE) || defined(_WIN32_WCE) || defined(UNDER_CE)
+#if defined(PJ_AUTOCONF)
+    /*
+     * Autoconf
+     */
+#   include <pj/compat/os_auto.h>
+
+#elif defined(PJ_WIN32_WINCE) || defined(_WIN32_WCE) || defined(UNDER_CE)
     /*
      * Windows CE
      */
@@ -108,7 +114,13 @@
 /********************************************************************
  * Target machine specific configuration.
  */
-#if defined (PJ_M_I386) || defined(_i386_) || defined(i_386_) || \
+#if defined(PJ_AUTOCONF)
+    /*
+     * Autoconf configured
+     */
+#include <pj/compat/m_auto.h>
+
+#elif defined (PJ_M_I386) || defined(_i386_) || defined(i_386_) || \
 	defined(_X86_) || defined(x86) || defined(__i386__) || \
 	defined(__i386) || defined(_M_IX86) || defined(__I86__)
     /*