1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200
|
Description: update configure.ac
Update configure.ac to prevent autoheader from failing
Author: Christian T. Steigies <cts@debian.org>
Last-Update: 2016-07-05
Index: gle-graphics/configure.ac
===================================================================
--- gle-graphics.orig/configure.ac
+++ gle-graphics/configure.ac
@@ -189,11 +189,11 @@ USE_ARCH=no
case $host in
*-*-cygwin*)
- AC_DEFINE(__CYGWIN__)
+ AC_DEFINE([__CYGWIN__], [], ["__cygwin__"])
HAVE_CYGWIN=1
;;
*-*-mingw*)
- AC_DEFINE(__CYGWIN__)
+ AC_DEFINE([__CYGWIN__], [], ["__cygwin__"])
HAVE_CYGWIN=1
HAVE_MINGW=1
;;
@@ -236,11 +236,11 @@ dnl check for Win32
dnl ********************************************************************************
if test "x$HAVE_WIN32" != "x1"; then
- AC_DEFINE(__UNIX__)
+ AC_DEFINE([__UNIX__], [], ["__unix__"])
# MacOS should also define __UNIX__
else
- AC_DEFINE(__WIN32__)
- AC_DEFINE(__NOCYGWIN__)
+ AC_DEFINE([__WIN32__], [], ["__win32__"])
+ AC_DEFINE([__NOCYGWIN__], [], ["__nocygwin__"])
CPPFLAGS="-mno-cygwin -mthreads -mms-bitfields -march=i386 $CPPFLAGS"
CXXFLAGS="-mno-cygwin -mthreads -mms-bitfields -march=i386 $CXXFLAGS"
LDFLAGS="-mno-cygwin -mthreads -mms-bitfields -march=i386 $LDFLAGS"
@@ -285,7 +285,7 @@ dnl is Mac OX/X?
dnl ********************************************************************************
if test "x$HAVE_MAC" = "x1"; then
- AC_DEFINE(__MACOS__)
+ AC_DEFINE([__MACOS__], [], [__macos__])
HAVE_RPATH=0
fi
@@ -294,7 +294,7 @@ dnl is Free BSD?
dnl ********************************************************************************
if test "x$HAVE_FREEBSD" = "x1"; then
- AC_DEFINE(__FREEBSD__)
+ AC_DEFINE([__FREEBSD__], [], [__freebsd__])
fi
dnl ********************************************************************************
@@ -302,7 +302,7 @@ dnl is Linux?
dnl ********************************************************************************
if test "x$HAVE_LINUX" = "x1"; then
- AC_DEFINE(__LINUX__)
+ AC_DEFINE([__LINUX__], [], [""])
fi
dnl ********************************************************************************
@@ -310,7 +310,7 @@ dnl is GNU / Hurd
dnl ********************************************************************************
if test "x$HAVE_GNU_HURD" = "x1"; then
- AC_DEFINE(__GNU_HURD__)
+ AC_DEFINE([__GNU_HURD__], [], [""])
fi
dnl ********************************************************************************
@@ -385,7 +385,7 @@ if test "$with_z" != no; then
[])
if test "x$HAVE_LIBZ" = "x1"; then
- AC_DEFINE(HAVE_LIBZ)
+ AC_DEFINE([HAVE_LIBZ], [], [""])
if test "x$HAVE_STATIC_LIBZ" = "x1"; then
LIBS="-Wl,-Bstatic -lz -Wl,-Bdynamic $LIBS"
else
@@ -419,7 +419,7 @@ case $host in
esac
if test "$HAVE_SOCKETS" = 1; then
- AC_DEFINE(HAVE_SOCKETS)
+ AC_DEFINE([HAVE_SOCKETS], [], [""])
fi
dnl ********************************************************************************
@@ -440,7 +440,7 @@ if test "$with_jpeg" != no; then
AC_CHECK_LIB(jpeg,jpeg_destroy_decompress,
[AC_CHECK_HEADERS(jpeglib.h,
[HAVE_LIBJPEG=1
- AC_DEFINE(HAVE_LIBJPEG)
+ AC_DEFINE([HAVE_LIBJPEG], [], [""])
],
[AC_MSG_WARN([found jpeg library but not jpegio.h: make sure libjpeg development package is installed])
])],
@@ -475,7 +475,7 @@ if test "$with_tiff" != no; then
AC_CHECK_LIB(tiff,TIFFReadScanline,
[AC_CHECK_HEADERS(tiffio.h,
[HAVE_LIBTIFF=1
- AC_DEFINE(HAVE_LIBTIFF)
+ AC_DEFINE([HAVE_LIBTIFF], [], ["libtiff"])
],
[AC_MSG_WARN([found TIFF library but not tiffio.h: make sure libtiff development package is installed])
CPPFLAGS=$_CPPFLAGS
@@ -501,7 +501,7 @@ dnl ************************************
if test "$with_png" != no; then
if test -d "$with_png"; then
HAVE_LIBPNG=1
- AC_DEFINE(HAVE_LIBPNG)
+ AC_DEFINE([HAVE_LIBPNG], [], ["libpng"])
CPPFLAGS="$CPPFLAGS -I$with_png/include"
LDFLAGS="$LDFLAGS -L$with_png/lib"
if test "x$with_staticlink" = "xyes"; then
@@ -512,7 +512,7 @@ if test "$with_png" != no; then
else
PKG_CHECK_MODULES([libpng], [libpng >= 0],
[HAVE_LIBPNG=1
- AC_DEFINE(HAVE_LIBPNG)
+ AC_DEFINE([HAVE_LIBPNG], [], ["libpng"])
if test "x$with_staticlink" = "xyes"; then
LIBS="-Wl,-Bstatic $libpng_LIBS -Wl,-Bdynamic $LIBS"
else
@@ -527,7 +527,7 @@ if test "$with_png" != no; then
AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
if test -n "$LIBPNG_CONFIG"; then
HAVE_LIBPNG=1
- AC_DEFINE(HAVE_LIBPNG)
+ AC_DEFINE([HAVE_LIBPNG], [], [""])
libpng_CPPFLAGS=`libpng-config --cflags`
libpng_LDFLAGS=`libpng-config --ldflags`
CPPFLAGS="$libpng_CPPFLAGS $CPPFLAGS"
@@ -649,7 +649,7 @@ if test "x$with_qt" != "xno"; then
fi
AC_CHECK_HEADERS(GL/glu.h,
- [AC_DEFINE(HAVE_LIBGLU_H)],
+ [AC_DEFINE([HAVE_LIBGLU_H], [], ["have_libglu"])],
[])
AC_CHECK_LIB(GLU,gluLookAt,
@@ -675,13 +675,13 @@ fi
if test "x$with_libgle" = "xboth"; then
HAVE_LIBGLE_STATIC=1
- AC_DEFINE(HAVE_LIBGLE_STATIC)
+ AC_DEFINE([HAVE_LIBGLE_STATIC], [], [""])
with_libgle=yes
fi
if test "x$with_libgle" = "xyes"; then
HAVE_LIBGLE=1
- AC_DEFINE(HAVE_LIBGLE)
+ AC_DEFINE([HAVE_LIBGLE], [], [""])
case $host in
*-*-linux*|*-*-kfreebsd*)
LIBGLE_CPPFLAGS="-fPIC "
@@ -693,7 +693,7 @@ fi
if test "x$with_libgle" = "xstatic"; then
HAVE_LIBGLE_STATIC=1
- AC_DEFINE(HAVE_LIBGLE_STATIC)
+ AC_DEFINE([HAVE_LIBGLE_STATIC], [], ["libgle_static"])
fi
dnl ********************************************************************************
@@ -742,10 +742,10 @@ if test "x$with_manip" != "xno"; then
])
])
if test "$HAVE_NCURSES_H" = "1"; then
- AC_DEFINE(HAVE_NCURSES_H)
+ AC_DEFINE([HAVE_NCURSES_H], [], ["ncurses"])
fi
if test "$HAVE_CURSES_H" = "1"; then
- AC_DEFINE(HAVE_CURSES_H)
+ AC_DEFINE([HAVE_CURSES_H], [], ["curses"])
fi
MANIP_LIBS=$LIBS
MANIP_LDFLAGS=$LDFLAGS
@@ -843,13 +843,13 @@ dnl final substitutes
dnl ********************************************************************************
if test "x$HAVE_X11" != "x0"; then
- AC_DEFINE(HAVE_X11)
+ AC_DEFINE([HAVE_X11], [], ["x11"])
fi
if test "x$HAVE_CAIRO" != "x0"; then
- AC_DEFINE(HAVE_CAIRO)
+ AC_DEFINE([HAVE_CAIRO], [], ["cairo"])
fi
if test "x$HAVE_POPPLER" != "x0"; then
- AC_DEFINE(HAVE_POPPLER)
+ AC_DEFINE([HAVE_POPPLER], [], ["poppler"])
fi
AC_SUBST(HAVE_SOCKETS)
|