fix configure script directly, not worth running autoconf

This commit is contained in:
naddy 2001-09-20 01:32:03 +00:00
parent d103cdf805
commit 99082f2919
12 changed files with 64 additions and 66 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2001/09/18 15:53:13 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2001/09/20 01:32:03 naddy Exp $
COMMENT= "Scrollkeeper Open Documentation Cataloging System"
V= 0.2
@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/09/18 15:53:13 naddy Exp $
--- aclocal.m4.orig Wed Mar 28 14:00:03 2001
+++ aclocal.m4 Tue Sep 18 17:31:26 2001
@@ -591,10 +591,9 @@ AC_DEFUN(AM_WITH_NLS,
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.1 2001/09/20 01:32:03 naddy Exp $
--- configure.orig Wed Mar 28 14:00:09 2001
+++ configure Thu Sep 20 03:08:20 2001
@@ -3152,6 +3152,10 @@ fi
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
cat >> confdefs.h <<\EOF

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2001/09/19 11:43:53 naddy Exp $
# $OpenBSD: Makefile,v 1.5 2001/09/20 01:32:03 naddy Exp $
COMMENT= "GNOME control center"
V= 1.4.0.1
@ -24,7 +24,7 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --localstatedir=/var/gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/09/18 20:28:53 naddy Exp $
--- aclocal.m4.orig Tue Sep 18 19:52:12 2001
+++ aclocal.m4 Tue Sep 18 19:52:56 2001
@@ -1503,6 +1503,10 @@ AC_DEFUN(AM_GNOME_WITH_NLS,
gt_cv_func_gettext_libintl=no)])
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
AC_DEFINE(HAVE_GETTEXT)

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.3 2001/09/20 01:32:03 naddy Exp $
--- configure.orig Wed Mar 28 21:46:14 2001
+++ configure Thu Sep 20 03:10:59 2001
@@ -4382,6 +4382,10 @@ fi
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
cat >> confdefs.h <<\EOF

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2001/09/17 20:54:41 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2001/09/20 01:32:03 naddy Exp $
COMMENT= "Object Activation Framework for GNOME"
V= 0.6.5
@ -22,7 +22,7 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2001/09/18 15:10:04 naddy Exp $
--- aclocal.m4.orig Tue Sep 18 16:45:13 2001
+++ aclocal.m4 Tue Sep 18 16:46:09 2001
@@ -71,6 +71,10 @@ AC_DEFUN(AM_GNU_OAF_WITH_NLS,
gt_cv_func_gettext_libintl=no)])
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
AC_DEFINE(HAVE_GETTEXT)

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.1 2001/09/20 01:32:03 naddy Exp $
--- configure.orig Fri Mar 2 04:16:10 2001
+++ configure Thu Sep 20 03:17:11 2001
@@ -3450,6 +3450,10 @@ fi
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
cat >> confdefs.h <<\EOF

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2001/09/18 22:03:43 naddy Exp $
# $OpenBSD: Makefile,v 1.6 2001/09/20 01:32:03 naddy Exp $
COMMENT= "GNOME Virtual File System"
V= 1.0.1
@ -24,7 +24,7 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/gtk-1.2 -D_POSIX_THREAD_SYSCALL_SOFT=1" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/09/18 15:18:52 naddy Exp $
--- aclocal.m4.orig Tue Sep 18 16:41:30 2001
+++ aclocal.m4 Tue Sep 18 16:42:06 2001
@@ -1592,6 +1592,10 @@ AC_DEFUN([AM_GNOME_WITH_NLS],
gt_cv_func_gettext_libintl=no)])
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
AC_DEFINE(HAVE_GETTEXT)

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.3 2001/09/20 01:32:03 naddy Exp $
--- configure.orig Tue May 8 01:12:27 2001
+++ configure Thu Sep 20 03:21:21 2001
@@ -5142,6 +5142,10 @@ fi
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ LIBS="$LIBS -lintl";
+ fi
+
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
cat >> confdefs.h <<\EOF