Commit 9c04e8f8 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

PackageTests/Configure: Use zlib instead of X11.

Fixes (part of) #3623.
parent 91d07f17
......@@ -91,9 +91,9 @@ extra-source-files:
tests/PackageTests/CMain/my.cabal
tests/PackageTests/Configure/A.hs
tests/PackageTests/Configure/Setup.hs
tests/PackageTests/Configure/X11.buildinfo.in
tests/PackageTests/Configure/X11.cabal
tests/PackageTests/Configure/include/HsX11Config.h.in
tests/PackageTests/Configure/include/HsZlibConfig.h.in
tests/PackageTests/Configure/zlib.buildinfo.in
tests/PackageTests/Configure/zlib.cabal
tests/PackageTests/CopyAssumeDepsUpToDate/CopyAssumeDepsUpToDate.cabal
tests/PackageTests/CopyAssumeDepsUpToDate/Main.hs
tests/PackageTests/CopyAssumeDepsUpToDate/P.hs
......
buildable: True
cc-options:
ld-options:
AC_INIT([Haskell X11 package], [1.1], [libraries@haskell.org], [X11])
AC_INIT([Haskell zlib package], [1.1], [libraries@haskell.org], [zlib])
# Safety check: Ensure that we are in the correct source directory.
AC_CONFIG_SRCDIR([X11.cabal])
AC_CONFIG_SRCDIR([zlib.cabal])
# Header file to place defines in
AC_CONFIG_HEADERS([include/HsX11Config.h])
AC_CONFIG_HEADERS([include/HsZlibConfig.h])
# Check for X11 include paths and libraries
AC_PATH_XTRA
AC_TRY_CPP([#include <X11/Xlib.h>],,[no_x=yes])
# Check for zlib include
AC_CHECK_HEADER(zlib.h, [ZLIB_HEADER=yes], [], [])
# Build the package if we found X11 stuff
if test "$no_x" = yes
if test "x$ZLIB_HEADER" = "x"
then BUILD_PACKAGE_BOOL=False
else BUILD_PACKAGE_BOOL=True
fi
AC_SUBST([BUILD_PACKAGE_BOOL])
AC_CONFIG_FILES([X11.buildinfo])
AC_CONFIG_FILES([zlib.buildinfo])
AC_OUTPUT
/* include/HsX11Config.h.in. Generated from configure.ac by autoheader. */
/* include/HsZlibConfig.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
......@@ -18,5 +45,5 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
buildable: @BUILD_PACKAGE_BOOL@
cc-options: @X_CFLAGS@
ld-options: @X_LIBS@
cc-options: @CFLAGS@
ld-options: @LIBS@
name: X11
name: zlib
version: 1.1
license: BSD3
author: Edward Z. Yang
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment