Fix most linkage errors by correcting configure.in

2 files changed, 46 insertions, 26 deletions

diff --git a/configure b/configure
index 09f6ffaa..a79ed9a0 100755
--- a/configure
+++ b/configure
@@ -3911,6 +3911,22 @@ EOF
     esac
 
     if test "$OS_TARGET" = "WINCE"; then
+        cat >> confdefs.h <<\EOF
+#define UNICODE 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define _UNICODE 1
+EOF
+
+	cat >> confdefs.h <<\EOF
+#define _WIN32_WCE 300
+EOF
+
+	cat >> confdefs.h <<\EOF
+#define UNDER_CE 300
+EOF
+
         case "$TARGETCPU" in
         X86)
 	        cat >> confdefs.h <<\EOF
@@ -3921,6 +3937,10 @@ EOF
 #define x86 1
 EOF
 
+	        cat >> confdefs.h <<\EOF
+#define _WIN32_WCE_CEPC 1
+EOF
+
             ;;
         ARM)
 	        cat >> confdefs.h <<\EOF
@@ -3937,10 +3957,6 @@ EOF
 #define _CPU_ARCH_NOT_DEFINED_ 1
 EOF
 
-	        cat >> confdefs.h <<\EOF
-#define CPU_ARCH_NOT_DEFINED 1
-EOF
-
             ;;
         esac
     else
@@ -4264,17 +4280,17 @@ EOF
 
     ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
-echo "configure:4268: checking for machine/builtins.h" >&5
+echo "configure:4284: checking for machine/builtins.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4273 "configure"
+#line 4289 "configure"
 #include "confdefs.h"
 #include <machine/builtins.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4789,12 +4805,12 @@ esac
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 
 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "configure:4793: checking for dlopen" >&5
+echo "configure:4809: checking for dlopen" >&5
 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4798 "configure"
+#line 4814 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen(); below.  */
@@ -4817,7 +4833,7 @@ dlopen();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dlopen=yes"
 else
@@ -4836,7 +4852,7 @@ else
   echo "$ac_t""no" 1>&6
 
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4840: checking for dlopen in -ldl" >&5
+echo "configure:4856: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4844,7 +4860,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4848 "configure"
+#line 4864 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4855,7 +4871,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:4859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4883,13 +4899,13 @@ fi
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:4887: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:4903: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 4893 "configure"
+#line 4909 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -4907,7 +4923,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 4911 "configure"
+#line 4927 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -4931,12 +4947,12 @@ fi
 for ac_func in lchown strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4935: checking for $ac_func" >&5
+echo "configure:4951: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4940 "configure"
+#line 4956 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4959,7 +4975,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4997,7 +5013,7 @@ fi
 
 
 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:5001: checking for pthread_create in -lpthreads" >&5
+echo "configure:5017: checking for pthread_create in -lpthreads" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { int a = 1;  } 
@@ -5019,7 +5035,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:5023: checking for pthread_create in -lpthread" >&5
+echo "configure:5039: checking for pthread_create in -lpthread" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { int a = 1;  } 
@@ -5041,7 +5057,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:5045: checking for pthread_create in -lc_r" >&5
+echo "configure:5061: checking for pthread_create in -lc_r" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { int a = 1;  } 
@@ -5063,7 +5079,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:5067: checking for pthread_create in -lc" >&5
+echo "configure:5083: checking for pthread_create in -lc" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { int a = 1;  } 
@@ -5213,7 +5229,7 @@ if test -n "$USE_PTHREADS"; then
       rm -f conftest*
    ac_cv_have_dash_pthread=no
    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:5217: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:5233: checking whether ${CC-cc} accepts -pthread" >&5
    echo 'int main() { return 0; }' | cat > conftest.c
    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
    if test $? -eq 0; then
@@ -5236,7 +5252,7 @@ echo "configure:5217: checking whether ${CC-cc} accepts -pthread" >&5
 			    ac_cv_have_dash_pthreads=no
     if test "$ac_cv_have_dash_pthread" = "no"; then
 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
-echo "configure:5240: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:5256: checking whether ${CC-cc} accepts -pthreads" >&5
     	echo 'int main() { return 0; }' | cat > conftest.c
 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
     	if test $? -eq 0; then
diff --git a/configure.in b/configure.in
index ea23ffaf..793cd354 100644
--- a/configure.in
+++ b/configure.in
@@ -1344,10 +1344,15 @@ case "$target" in
     esac
 
     if test "$OS_TARGET" = "WINCE"; then
+        AC_DEFINE(UNICODE)
+        AC_DEFINE(_UNICODE)
+	AC_DEFINE(_WIN32_WCE, 300)
+	AC_DEFINE(UNDER_CE, 300)
         case "$TARGETCPU" in
         X86)
 	        AC_DEFINE(_X86_)
 	        AC_DEFINE(x86)
+	        AC_DEFINE(_WIN32_WCE_CEPC)
             ;;
         ARM)
 	        AC_DEFINE(_ARM_)
@@ -1355,7 +1360,6 @@ case "$target" in
             ;;
         *)
 	        AC_DEFINE(_CPU_ARCH_NOT_DEFINED_)
-	        AC_DEFINE(CPU_ARCH_NOT_DEFINED)
             ;;
         esac
     else