add various files of PortableApps packaging

[obnox/wireshark/wip.git] / configure.in

diff --git a/configure.in b/configure.in
index f16cb705cc0d94fe61c75d342d7d1373bebaee29..765f44e5e7b2d6e5a2989b5debfac3900f856c50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -346,23 +346,19 @@ esac
 AC_SUBST(LDFLAGS_SHAREDLIB)
 
 #
-# On OS X, if we find the headers for Core Foundation and Launch Services,
-# add -framework options to link with Application Services (of which
-# Launch Services is a subframework) and Core Foundation (required by
-# the Launch Services APIs), so we can use that to launch a Web browser
-# from the Help menu.
-#
-# (Do those headers exist on pure Darwin?  If so, does the CoreFoundation
-# *and* Launch Services code exist there, or are those headers just stubs?
-# If the frameworks aren't present on Darwin, how *should* we check for
-# their existence?)
+# On OS X, if we find the headers for Core Foundation, Launch Services,
+# and Core Services, add -framework options to link with Application
+# Services (of which Launch Services is a subframework), Core Foundation
+# (required by the Launch Services APIs), and Core Services, so we can
+# use them to launch a Web browser from the Help menu and to use
+# Gestalt() to get the Mac OS X version number.
 #
 case "$host_os" in
 
 darwin*)
-       AC_MSG_CHECKING(whether we can build with Core Foundation and Launch Services)
+       AC_MSG_CHECKING([whether we can build with Core Foundation, Launch Services, and Core Services])
        ac_save_LIBS="$LIBS"
-       ac_frameworks="-framework ApplicationServices -framework CoreFoundation"
+       ac_frameworks="-framework ApplicationServices -framework CoreFoundation -framework CoreServices"
        LIBS="$LIBS $ac_frameworks"
        AC_TRY_LINK(
           [
@@ -370,20 +366,24 @@ darwin*)
 #       include <CoreFoundation/CFString.h>
 #       include <CoreFoundation/CFURL.h>
 #       include <ApplicationServices/ApplicationServices.h>
+#      include <CoreServices/CoreServices.h>
           ],
           [
        CFStringRef url_CFString;
        CFURLRef url_CFURL;
        OSStatus status;
+       long os_version;
 
        url_CFString = CFStringCreateWithCString(NULL, "", kCFStringEncodingASCII);
        url_CFURL = CFURLCreateWithString(NULL, url_CFString, NULL);
        status = LSOpenCFURLRef(url_CFURL, NULL);
+
+       Gestalt(gestaltSystemVersion, &os_version);
           ],
-          ac_cv_can_use_cf_and_ls=yes,
-          ac_cv_can_use_cf_and_ls=no,
+          ac_cv_can_use_osx_frameworks=yes,
+          ac_cv_can_use_osx_frameworks=no,
           [echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       if test "$ac_cv_can_use_cf_and_ls" = yes ; then
+       if test "$ac_cv_can_use_osx_frameworks" = yes ; then
                AC_DEFINE(HAVE_OS_X_FRAMEWORKS, 1, [Define to 1 if you have OS X frameworks])
                FRAMEWORKS="$ac_frameworks"
                AC_MSG_RESULT(yes)
@@ -1491,9 +1491,13 @@ AC_OUTPUT(
   asn1/h235/Makefile
   asn1/h245/Makefile
   asn1/h248/Makefile
+  asn1/h282/Makefile
+  asn1/h283/Makefile
   asn1/h323/Makefile
   asn1/h450/Makefile
   asn1/h450-ros/Makefile
+  asn1/h460/Makefile
+  asn1/h501/Makefile
   asn1/inap/Makefile
   asn1/ldap/Makefile
   asn1/logotype-cert-extn/Makefile
@@ -1528,6 +1532,7 @@ AC_OUTPUT(
   asn1/smrse/Makefile
   asn1/snmp/Makefile
   asn1/spnego/Makefile
+  asn1/t125/Makefile
   asn1/t38/Makefile
   asn1/tcap/Makefile
   asn1/ulp/Makefile