the configure script doesn't match configure.ac.

pointed an ok espie@
This commit is contained in:
shadchin 2012-07-09 14:18:16 +00:00
parent f253937abb
commit c8e769644a
3 changed files with 19 additions and 46 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2012/07/08 14:46:01 shadchin Exp $
# $OpenBSD: Makefile,v 1.29 2012/07/09 14:18:16 shadchin Exp $
COMMENT= view, decode and encode DjVu files
DISTNAME= djvulibre-3.5.25.3
REVISION= 0
SHARED_LIBS= djvulibre 25.0 # 25.0
CATEGORIES= graphics print
@ -31,9 +32,11 @@ USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_GROFF = Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-jpeg=${LOCALBASE} \
--with-tiff=${LOCALBASE}
AUTOCONF_VERSION= 2.67
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --with-jpeg=${LOCALBASE} \
--with-tiff=${LOCALBASE}
NO_REGRESS= Yes

View File

@ -1,42 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2012/07/08 09:13:59 shadchin Exp $
--- configure.orig Sun Mar 18 04:49:02 2012
+++ configure Sun Apr 15 20:28:01 2012
@@ -14740,13 +14740,12 @@ fi
for opt in $saved_CXXFLAGS ; do
case $opt in
-g*) test $ac_debug != no && OPTS="$OPTS $opt" ;;
- -O*) ;;
*) CXXFLAGS="$CXXFLAGS $opt" ;;
esac
done
for opt in $saved_CFLAGS ; do
case $opt in
- -O*|-g*) ;;
+ -g*) ;;
*) CFLAGS="$CFLAGS $opt" ;;
esac
done
@@ -14778,7 +14777,6 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
rm conftest.*
- OPTS="$OPTS -O3"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -14792,7 +14790,6 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
rm conftest.*
- OPTS="$OPTS -O2"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -14833,7 +14830,6 @@ $as_echo_n "checking if $CXX accepts $opt... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
rm conftest.*
- OPTS="$OPTS $opt"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.1 2012/07/09 14:18:16 shadchin Exp $
--- configure.ac.orig Tue May 8 08:56:53 2012
+++ configure.ac Mon Jul 9 19:41:00 2012
@@ -117,7 +117,7 @@ AC_SUBST(LIBTOOL_DEPS)
# C++
AC_LANG(C++)
-AC_CXX_OPTIMIZE
+AC_SUBST(OPTS)
AC_CXX_BOOL
AC_CXX_EXCEPTIONS
AC_CXX_TYPENAME