head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.1
date	2005.01.12.11.01.18;	author ms;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2005.01.12.11.01.18;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.52.00;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@add missing libodbcplus.patch to CVS, correct description text, and correct vheck(1) regex
@
text
@Index: configure.ac
diff -Nau configure.ac.orig configure.ac
--- configure.ac.orig	2005-01-11 19:48:28 +0100
+++ configure.ac	2005-01-11 19:59:30 +0100
@@@@ -136,8 +136,14 @@@@
 
 AC_ARG_WITH(isqlxx,
 [  --with-isqlxx           Build isql++ [default=no]],
-with_isqlxx=yes,
-with_isqlxx=no)
+[
+if test "x$withval" = "xno"
+then
+	with_isqlxx=no
+else
+	with_isqlxx=yes
+fi
+])
 
 AC_MSG_RESULT($with_isqlxx)
 
@@@@ -198,14 +204,19 @@@@
 AC_ARG_WITH(qt,
 [  --with-qt[=PREFIX]      Use QT installed in DIR],
 [
-enable_qt=yes
 if test "x$withval" = "xyes"
 then
+	enable_qt=yes
 	if test "x$QTDIR" != "x"
 	then
 		qt_prefix="$QTDIR"
 	fi
+elif test "x$withval" = "xno"
+then
+	enable_qt=no
+	qt_prefix=
 else
+	enable_qt=yes
 	qt_prefix="$withval"
 fi
 ])
Index: configure
diff -Nau configure.orig configure
--- configure.orig	2005-01-11 20:08:17 +0100
+++ configure	2005-01-11 20:10:03 +0100
@@@@ -11203,9 +11203,13 @@@@
 # Check whether --with-isqlxx or --without-isqlxx was given.
 if test "${with_isqlxx+set}" = set; then
   withval="$with_isqlxx"
-  with_isqlxx=yes
+
+if test "x$withval" = "xno"
+then
+	with_isqlxx=no
 else
-  with_isqlxx=no
+	with_isqlxx=yes
+fi
 fi;
 
 echo "$as_me:$LINENO: result: $with_isqlxx" >&5
@@@@ -11635,14 +11639,19 @@@@
 if test "${with_qt+set}" = set; then
   withval="$with_qt"
 
-enable_qt=yes
 if test "x$withval" = "xyes"
 then
+	enable_qt=yes
 	if test "x$QTDIR" != "x"
 	then
 		qt_prefix="$QTDIR"
 	fi
+elif test "x$withval" = "xno"
+then
+	enable_qt=no
+	qt_prefix=
 else
+	enable_qt=yes
 	qt_prefix="$withval"
 fi
 
@


1.1.2.1
log
@file libodbcplus.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:52:00 +0000
@
text
@d1 83
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 83
Index: configure.ac
diff -Nau configure.ac.orig configure.ac
--- configure.ac.orig	2005-01-11 19:48:28 +0100
+++ configure.ac	2005-01-11 19:59:30 +0100
@@@@ -136,8 +136,14 @@@@
 
 AC_ARG_WITH(isqlxx,
 [  --with-isqlxx           Build isql++ [default=no]],
-with_isqlxx=yes,
-with_isqlxx=no)
+[
+if test "x$withval" = "xno"
+then
+	with_isqlxx=no
+else
+	with_isqlxx=yes
+fi
+])
 
 AC_MSG_RESULT($with_isqlxx)
 
@@@@ -198,14 +204,19 @@@@
 AC_ARG_WITH(qt,
 [  --with-qt[=PREFIX]      Use QT installed in DIR],
 [
-enable_qt=yes
 if test "x$withval" = "xyes"
 then
+	enable_qt=yes
 	if test "x$QTDIR" != "x"
 	then
 		qt_prefix="$QTDIR"
 	fi
+elif test "x$withval" = "xno"
+then
+	enable_qt=no
+	qt_prefix=
 else
+	enable_qt=yes
 	qt_prefix="$withval"
 fi
 ])
Index: configure
diff -Nau configure.orig configure
--- configure.orig	2005-01-11 20:08:17 +0100
+++ configure	2005-01-11 20:10:03 +0100
@@@@ -11203,9 +11203,13 @@@@
 # Check whether --with-isqlxx or --without-isqlxx was given.
 if test "${with_isqlxx+set}" = set; then
   withval="$with_isqlxx"
-  with_isqlxx=yes
+
+if test "x$withval" = "xno"
+then
+	with_isqlxx=no
 else
-  with_isqlxx=no
+	with_isqlxx=yes
+fi
 fi;
 
 echo "$as_me:$LINENO: result: $with_isqlxx" >&5
@@@@ -11635,14 +11639,19 @@@@
 if test "${with_qt+set}" = set; then
   withval="$with_qt"
 
-enable_qt=yes
 if test "x$withval" = "xyes"
 then
+	enable_qt=yes
 	if test "x$QTDIR" != "x"
 	then
 		qt_prefix="$QTDIR"
 	fi
+elif test "x$withval" = "xno"
+then
+	enable_qt=no
+	qt_prefix=
 else
+	enable_qt=yes
 	qt_prefix="$withval"
 fi
 
@