$NetBSD: patch-configure.in,v 1.1 2018/12/31 13:11:12 ryoon Exp $ --- configure.in.orig 2013-05-05 20:19:29.000000000 +0000 +++ configure.in @@ -2,7 +2,8 @@ dnl Process this file with autoconf to p prefix=/usr/bin -AC_INIT(gimprc.in) +AC_INIT(cinepaintrc.in) +AC_CONFIG_MACRO_DIR(aclocal) AM_CONFIG_HEADER(lib/config.h) dnl Initialize automake stuff @@ -38,9 +39,9 @@ AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_TIME -AC_CHECK_HEADER(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H)) -AC_CHECK_HEADER(sys/times.h, AC_DEFINE(HAVE_SYS_TIMES_H)) -AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H)) +AC_CHECK_HEADER(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H, 1, [desc])) +AC_CHECK_HEADER(sys/times.h, AC_DEFINE(HAVE_SYS_TIMES_H, 1, [desc])) +AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H, 1, [desc])) AC_TYPE_PID_T AC_TYPE_SIGNAL AC_FUNC_VPRINTF @@ -83,12 +84,12 @@ AC_TRY_COMPILE([#include ], if test $cinepaint_ok = no; then AC_HEADER_EGREP(fd_mask, sys/select.h, cinepaint_ok=yes) if test $cinepaint_ok = yes; then - AC_DEFINE(HAVE_SYS_SELECT_H) + AC_DEFINE(HAVE_SYS_SELECT_H, 1, [desc]) fi fi AC_MSG_RESULT($cinepaint_ok) if test $cinepaint_ok = no; then - AC_DEFINE(NO_FD_SET) + AC_DEFINE(NO_FD_SET, 1, [desc]) fi dnl flex check; beku @@ -109,7 +110,7 @@ fi dnl check for pkg-config export PKG_CONFIG_PATH AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test "x$PKG_CONFIG" == "xno"; then +if test "x$PKG_CONFIG" = "xno"; then AC_MSG_WARN([ *** Check for pkg-config failed. Many packages requires it. *** You can download it from http://pkgconfig.sourceforge.net/ .]) @@ -224,16 +225,16 @@ dnl Possibly change default precision fr precision=PRECISION_U16 AC_ARG_ENABLE(precision, [ --enable-precision={u8,u16,half,float} set the data precision [[default=u16]]], if eval "test x$enable_precision != x"; then - if eval "test x$enable_precision == xu8"; then + if eval "test x$enable_precision = xu8"; then precision=PRECISION_U8 fi - if eval "test x$enable_precision == xu16"; then + if eval "test x$enable_precision = xu16"; then precision=PRECISION_U16 fi - if eval "test x$enable_precision == xhalf"; then + if eval "test x$enable_precision = xhalf"; then precision=PRECISION_FLOAT16 fi - if eval "test x$enable_precision == xfloat"; then + if eval "test x$enable_precision = xfloat"; then precision=PRECISION_FLOAT fi fi) @@ -517,9 +518,9 @@ fi if test "x$FLTK_CONFIG" != "xno"; then FLTK_CONFIG="$FLTK_CONFIG" FLTK_LDFLAGS="`$FLTK_CONFIG --use-images --ldflags | sed \"$STRIPOPT\"`" - FLTK_LIBS_PURE="`echo $FLTK_LDFLAGS | sed 's/-O.// ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'`" + FLTK_LIBS_PURE="`echo $FLTK_LDFLAGS | sed 's/ -O. // ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'`" FLTK_LIBS="\$(top_builddir)/lib/fl_i18n/libcinepaint_fl_i18n.la $FLTK_LIBS_PURE" - FLTK_CFLAGS=`$FLTK_CONFIG --cxxflags | sed 's/-O.// ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'` + FLTK_CFLAGS=`$FLTK_CONFIG --cxxflags | sed 's/ -O. // ; s/-isysroot /-L/ ; s/-arch ppc// ; s/-arch i386//'` else AC_MSG_WARN([ *** Check for fltk-config failed. Depending plug-ins may not compile. @@ -528,8 +529,8 @@ fi fi dnl Check for shared memory -AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes) -AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes) +AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H, 1, [desc]), no_sys_ipc=yes) +AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H, 1, [desc]), no_sys_shm=yes) if test "$ac_cv_header_sys_shm_h" = "yes"; then AC_MSG_CHECKING(whether shmctl IPC_RMID allowes subsequent attaches) AC_TRY_RUN([ @@ -555,7 +556,7 @@ if test "$ac_cv_header_sys_shm_h" = "yes exit (0); } ], - AC_DEFINE(IPC_RMID_DEFERRED_RELEASE) + AC_DEFINE(IPC_RMID_DEFERRED_RELEASE, 1, [desc]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no), AC_MSG_RESULT(assuming no)) @@ -818,8 +819,8 @@ dnl Output the Makefiles AC_OUTPUT( Makefile user_install -gimprc -gimprc_user +cinepaintrc +cinepaintrc_user cinepainttool cinepaint-gtk.pc cinepaint.spec