rpms/unixODBC/devel unixODBC-config.patch, NONE, 1.1 unixODBC.spec, 1.29, 1.30

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Nov 21 20:41:05 UTC 2005 

Author: tgl

Update of /cvs/dist/rpms/unixODBC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23821

Modified Files:
	unixODBC.spec 
Added Files:
	unixODBC-config.patch 
Log Message:
Some more fixes to get it to build with the real modular X.

unixODBC-config.patch:
 acinclude.m4 |   46 +++++++++++++++++++++++-----------------------
 aclocal.m4   |   46 +++++++++++++++++++++++-----------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

--- NEW FILE unixODBC-config.patch ---
Recent versions of autoconf's AC_PATH_X macro expect "NO" to be spelled "no".


diff -Naur unixODBC-2.2.11.orig/acinclude.m4 unixODBC-2.2.11/acinclude.m4
--- unixODBC-2.2.11.orig/acinclude.m4	2004-12-10 04:21:59.000000000 -0500
+++ unixODBC-2.2.11/acinclude.m4	2005-11-21 15:14:39.000000000 -0500
@@ -43,7 +43,7 @@
 dnl
 AC_DEFUN(AC_FIND_FILE,
 [
-$3=NO
+$3=no
 for i in $2;
 do
   for j in $1;
@@ -326,12 +326,12 @@
 AC_CACHE_VAL(ac_cv_have_x,
 [# One or both of the vars are not set, and there is no cached value.
 if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-   kde_x_includes=NO
+   kde_x_includes=no
 else
    kde_x_includes=$x_includes
 fi
 if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-   kde_x_libraries=NO
+   kde_x_libraries=no
 else
    kde_x_libraries=$x_libraries
 fi
@@ -356,15 +356,15 @@
 
 # when the user already gave --x-includes, we ignore
 # what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
+if test "$kde_x_includes" = no; then
   kde_x_includes=$ac_x_includes  
 fi
 
-if test "$kde_x_includes" = NO; then
+if test "$kde_x_includes" = no; then
   AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths or run configure with --enable-gui=no!])
 fi
 
-if test "$ac_x_libraries" = NO; then
+if test "$ac_x_libraries" = no; then
   AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths or run configure with --enable-gui=no!])
 fi
 
@@ -558,7 +558,7 @@
 
 AC_DEFUN(AC_QT_TEXT,
 [
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
+ac_qt_includes=no ac_qt_libraries=no ac_qt_bindir=no
 qt_libraries=""
 qt_includes=""
 AC_ARG_WITH(qt-dir,
@@ -620,7 +620,7 @@
 
 qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/lib/qt $x_libraries"
 test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-if test ! "$ac_qt_libraries" = "NO"; then
+if test ! "$ac_qt_libraries" = "no"; then
   qt_libdirs="$ac_qt_libraries $qt_libdirs"
 fi
 
@@ -664,7 +664,7 @@
 else
   echo "configure: failed program was:" >&AC_FD_CC
   cat conftest.$ac_ext >&AC_FD_CC
-  ac_qt_libraries="NO"
+  ac_qt_libraries="no"
 fi
 rm -f conftest*
 CXXFLAGS="$ac_cxxflags_safe"
@@ -672,11 +672,11 @@
 LIBS="$ac_libs_safe"
 
 AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
+if test "$ac_qt_includes" = no || test "$ac_qt_libraries" = no; then
   ac_cv_have_qt="have_qt=no"
   ac_qt_notfound=""
-  if test "$ac_qt_includes" = NO; then
-    if test "$ac_qt_libraries" = NO; then
+  if test "$ac_qt_includes" = no; then
+    if test "$ac_qt_libraries" = no; then
       ac_qt_notfound="(headers and libraries)";
     else
       ac_qt_notfound="(headers)";
@@ -764,7 +764,7 @@
 
 qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/lib /usr/local/qt/lib /usr/lib/qt"
 test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-if test ! "$ac_qt_libraries" = "NO"; then
+if test ! "$ac_qt_libraries" = "no"; then
   qt_libdirs="$ac_qt_libraries $qt_libdirs"
 fi
 
@@ -795,7 +795,7 @@
 else
   echo "configure: failed program was:" >&AC_FD_CC
   cat conftest.$ac_ext >&AC_FD_CC
-  ac_qt_libraries="NO"
+  ac_qt_libraries="no"
 fi
 rm -f conftest*
 CXXFLAGS="$ac_cxxflags_safe"
@@ -803,11 +803,11 @@
 LIBS="$ac_libs_safe"
 
 AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
+if test "$ac_qt_includes" = no || test "$ac_qt_libraries" = no; then
   ac_cv_have_qt="have_qt=no"
   ac_qt_notfound=""
-  if test "$ac_qt_includes" = NO; then
-    if test "$ac_qt_libraries" = NO; then
+  if test "$ac_qt_includes" = no; then
+    if test "$ac_qt_libraries" = no; then
       ac_qt_notfound="(headers and libraries)";
     else
       ac_qt_notfound="(headers)";
@@ -845,7 +845,7 @@
   
   qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/lib /usr/local/qt/lib /usr/lib/qt"
   test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-  if test ! "$ac_qt_libraries" = "NO"; then
+  if test ! "$ac_qt_libraries" = "no"; then
     qt_libdirs="$ac_qt_libraries $qt_libdirs"
   fi
   
@@ -876,7 +876,7 @@
   else
     echo "configure: failed program was:" >&AC_FD_CC
     cat conftest.$ac_ext >&AC_FD_CC
-    ac_qt_libraries="NO"
+    ac_qt_libraries="no"
   fi
   rm -f conftest*
   CXXFLAGS="$ac_cxxflags_safe"
@@ -884,11 +884,11 @@
   LIBS="$ac_libs_safe"
 
   AC_LANG_RESTORE
-  if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
+  if test "$ac_qt_includes" = no || test "$ac_qt_libraries" = no; then
     ac_cv_have_qt_mt="have_qt=no"
     ac_qt_notfound=""
-    if test "$ac_qt_includes" = NO; then
-      if test "$ac_qt_libraries" = NO; then
+    if test "$ac_qt_includes" = no; then
+      if test "$ac_qt_libraries" = no; then
         ac_qt_notfound="(headers and libraries)";
       else
         ac_qt_notfound="(headers)";
@@ -1035,7 +1035,7 @@
 fi
 ac_kde_libraries="$kde_libdir"
 
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then
+if test "$ac_kde_includes" = no || test "$ac_kde_libraries" = no; then
   ac_cv_have_kde="have_kde=no"
 else
   ac_cv_have_kde="have_kde=yes \
diff -Naur unixODBC-2.2.11.orig/aclocal.m4 unixODBC-2.2.11/aclocal.m4
--- unixODBC-2.2.11.orig/aclocal.m4	2005-02-07 05:36:16.000000000 -0500
+++ unixODBC-2.2.11/aclocal.m4	2005-11-21 14:57:17.000000000 -0500
@@ -55,7 +55,7 @@
 dnl
 AC_DEFUN(AC_FIND_FILE,
 [
-$3=NO
+$3=no
 for i in $2;
 do
   for j in $1;
@@ -338,12 +338,12 @@
 AC_CACHE_VAL(ac_cv_have_x,
 [# One or both of the vars are not set, and there is no cached value.
 if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-   kde_x_includes=NO
+   kde_x_includes=no
 else
    kde_x_includes=$x_includes
 fi
 if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-   kde_x_libraries=NO
+   kde_x_libraries=no
 else
    kde_x_libraries=$x_libraries
 fi
@@ -368,15 +368,15 @@
 
 # when the user already gave --x-includes, we ignore
 # what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
+if test "$kde_x_includes" = no; then
   kde_x_includes=$ac_x_includes  
 fi
 
-if test "$kde_x_includes" = NO; then
+if test "$kde_x_includes" = no; then
   AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths or run configure with --enable-gui=no!])
 fi
 
-if test "$ac_x_libraries" = NO; then
+if test "$ac_x_libraries" = no; then
   AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths or run configure with --enable-gui=no!])
 fi
 
@@ -570,7 +570,7 @@
 
 AC_DEFUN(AC_QT_TEXT,
 [
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
+ac_qt_includes=no ac_qt_libraries=no ac_qt_bindir=no
 qt_libraries=""
 qt_includes=""
 AC_ARG_WITH(qt-dir,
@@ -632,7 +632,7 @@
 
 qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/lib/qt $x_libraries"
 test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-if test ! "$ac_qt_libraries" = "NO"; then
+if test ! "$ac_qt_libraries" = "no"; then
   qt_libdirs="$ac_qt_libraries $qt_libdirs"
 fi
 
@@ -676,7 +676,7 @@
 else
   echo "configure: failed program was:" >&AC_FD_CC
   cat conftest.$ac_ext >&AC_FD_CC
-  ac_qt_libraries="NO"
+  ac_qt_libraries="no"
 fi
 rm -f conftest*
 CXXFLAGS="$ac_cxxflags_safe"
@@ -684,11 +684,11 @@
 LIBS="$ac_libs_safe"
 
 AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
+if test "$ac_qt_includes" = no || test "$ac_qt_libraries" = no; then
   ac_cv_have_qt="have_qt=no"
   ac_qt_notfound=""
-  if test "$ac_qt_includes" = NO; then
-    if test "$ac_qt_libraries" = NO; then
+  if test "$ac_qt_includes" = no; then
+    if test "$ac_qt_libraries" = no; then
       ac_qt_notfound="(headers and libraries)";
     else
       ac_qt_notfound="(headers)";
@@ -776,7 +776,7 @@
 
 qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/lib /usr/local/qt/lib /usr/lib/qt"
 test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-if test ! "$ac_qt_libraries" = "NO"; then
+if test ! "$ac_qt_libraries" = "no"; then
   qt_libdirs="$ac_qt_libraries $qt_libdirs"
 fi
 
@@ -807,7 +807,7 @@
 else
   echo "configure: failed program was:" >&AC_FD_CC
   cat conftest.$ac_ext >&AC_FD_CC
-  ac_qt_libraries="NO"
+  ac_qt_libraries="no"
 fi
 rm -f conftest*
 CXXFLAGS="$ac_cxxflags_safe"
@@ -815,11 +815,11 @@
 LIBS="$ac_libs_safe"
 
 AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
+if test "$ac_qt_includes" = no || test "$ac_qt_libraries" = no; then
   ac_cv_have_qt="have_qt=no"
   ac_qt_notfound=""
-  if test "$ac_qt_includes" = NO; then
-    if test "$ac_qt_libraries" = NO; then
+  if test "$ac_qt_includes" = no; then
+    if test "$ac_qt_libraries" = no; then
       ac_qt_notfound="(headers and libraries)";
     else
       ac_qt_notfound="(headers)";
@@ -857,7 +857,7 @@
   
   qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/lib /usr/local/qt/lib /usr/lib/qt"
   test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-  if test ! "$ac_qt_libraries" = "NO"; then
+  if test ! "$ac_qt_libraries" = "no"; then
     qt_libdirs="$ac_qt_libraries $qt_libdirs"
   fi
   
@@ -888,7 +888,7 @@
   else
     echo "configure: failed program was:" >&AC_FD_CC
     cat conftest.$ac_ext >&AC_FD_CC
-    ac_qt_libraries="NO"
+    ac_qt_libraries="no"
   fi
   rm -f conftest*
   CXXFLAGS="$ac_cxxflags_safe"
@@ -896,11 +896,11 @@
   LIBS="$ac_libs_safe"
 
   AC_LANG_RESTORE
-  if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
+  if test "$ac_qt_includes" = no || test "$ac_qt_libraries" = no; then
     ac_cv_have_qt_mt="have_qt=no"
     ac_qt_notfound=""
-    if test "$ac_qt_includes" = NO; then
-      if test "$ac_qt_libraries" = NO; then
+    if test "$ac_qt_includes" = no; then
+      if test "$ac_qt_libraries" = no; then
         ac_qt_notfound="(headers and libraries)";
       else
         ac_qt_notfound="(headers)";
@@ -1047,7 +1047,7 @@
 fi
 ac_kde_libraries="$kde_libdir"
 
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then
+if test "$ac_kde_includes" = no || test "$ac_kde_libraries" = no; then
   ac_cv_have_kde="have_kde=no"
 else
   ac_cv_have_kde="have_kde=yes \


Index: unixODBC.spec
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- unixODBC.spec	7 Nov 2005 22:45:10 -0000	1.29
+++ unixODBC.spec	21 Nov 2005 20:41:02 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux.
 Name: unixODBC
 Version: 2.2.11
-Release: 5
+Release: 6
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
@@ -11,13 +11,14 @@
 Source2: ODBCConfig.desktop
 Source3: DataManager.desktop
 Patch1: depcomp.patch
+Patch2: unixODBC-config.patch
 Patch3: unixODBC-2.2.11-symbols.patch
 Patch4: parserupdate.patch
 Patch5: nortldglobal.patch
 Patch6: unixODBC-2.2.11-stricmp.patch
 
 Conflicts: iodbc
-BuildPrereq: libX11-devel libXext-devel
+BuildPrereq: libX11-devel libXt-devel libXext-devel
 BuildPrereq: kdelibs-devel qt-devel libmng-devel readline-devel
 BuildPrereq: automake autoconf libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -52,6 +53,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
@@ -174,6 +176,12 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Nov 21 2005 Tom Lane <tgl at redhat.com> 2.2.11-6
+- Patch NO-vs-no discrepancy between aclocal/acinclude and recent autoconf
+  versions (not sure if this has been broken for a long time, or was just
+  exposed by modular X changeover).
+- Apparently need to require libXt-devel too for modular X.
+
 * Mon Nov  7 2005 Tom Lane <tgl at redhat.com> 2.2.11-5
 - Adjust BuildPrereq for modular X.

More information about the fedora-cvs-commits mailing list