Changeset 42:84574c08b090 in xplcommon

Timestamp:

01/20/13 09:05:33 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 2 'hg:/home/ivaradi/xplane/hg/xplcommon' '/'>, 'public')

Message:

Made use of the AM_VSCPL_TARGET_API macro

Files:

• bootstrap.sh (modified) (2 diffs)
• configure.ac (modified) (1 diff)

bootstrap.sh

@@ -1 +1 @@
 #!/bin/sh
+
+set -e -u
 
 scriptdir=`dirname $0`
@@ -6 +8 @@
 
 libtoolize
-aclocal -I m4
+aclocal -I m4 -I $1
 automake -a
 autoconf

configure.ac

@@ -9 +9 @@
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_CHECK_HEADERS([windows.h winsock2.h])
-
-test "$ac_cv_header_windows_h" = "yes" -a "$ac_cv_header_winsock2_h" = "yes"
-_target_win32=$?
-
-AM_CONDITIONAL([TARGET_API_WIN32], test $_target_win32 -eq 0)
-AM_CONDITIONAL([TARGET_API_WIN64], test $_target_win32 -eq 0 -a "$host_cpu" = "x86_64")
-AM_CONDITIONAL([TARGET_API_POSIX], test $_target_win32 -ne 0)
-if test $_target_win32 -eq 0; then
-   if test "$host_cpu" = "x86_64"; then
-       AC_DEFINE([TARGET_API_WIN64], [1], [Define if the target is the 64-bit Win32 API.])
-   fi
-   AC_DEFINE([TARGET_API_WIN32], [1], [Define if the target is the Win32 API.])
-else
-   AC_DEFINE([TARGET_API_POSIX], [1], [Define if the target is the POSIX API.])
-fi
+AM_VSCPL_TARGET_API
 
 AC_MSG_CHECKING([where to find the X-Plane Plugin SDK])