Date: Wed, 14 Nov 2007 00:37:37 +0100 From: "\"Pietro Cerutti\" <Pietro Cerutti" <gahr@gahr.ch> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/118027: [patch] devel/gcvs unbreak fix build with GCC 4.2 + get rid of a few warnings Message-ID: <1194997057.68964@gahrtop.localhost> Resent-Message-ID: <200711132340.lADNe1Cu005445@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118027
>Category: ports
>Synopsis: [patch] devel/gcvs unbreak fix build with GCC 4.2 + get rid of a few warnings
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 13 23:40:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Pietro Cerutti
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
Bern University of Applied Sciences
>Environment:
System: FreeBSD 8.0-CURRENT #9: Fri Nov 9 14:50:37 CET 2007
root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034
>Description:
- fixed a few (actually, a lot of) "deprecated conversion from string to const char *" errors
- got rid of a few (actually, a lot of) warnings
>How-To-Repeat:
cd /usr/ports/devel/gcvs && make
>Fix:
--- _gcvs.diff begins here ---
--- Makefile.orig 2007-11-13 22:07:07.000000000 +0100
+++ Makefile 2007-11-13 22:07:29.000000000 +0100
@@ -33,10 +33,4 @@
INFO= cvs cvsclient
USE_AUTOTOOLS= automake:15:env autoconf:261:env
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Broken with gcc 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- files/patch-common-UCvsFiles.cpp.orig 2003-08-24 19:34:45.000000000 +0200
+++ files/patch-common-UCvsFiles.cpp 2007-11-13 23:13:57.000000000 +0100
@@ -1,5 +1,14 @@
---- common/UCvsFiles.cpp.orig Tue Aug 13 13:46:40 2002
-+++ common/UCvsFiles.cpp Sun Aug 24 13:47:21 2003
+--- common/UCvsFiles.cpp.orig 2002-08-13 13:46:40.000000000 +0200
++++ common/UCvsFiles.cpp 2007-11-13 23:13:25.000000000 +0100
+@@ -201,7 +201,7 @@
+
+ #define NUM_COLUMNS 7
+
+-static char *_gszColumnLabel[NUM_COLUMNS] =
++static const char *_gszColumnLabel[NUM_COLUMNS] =
+ {
+ "Name", "Rev.", "Option", "Status", "Tag", "Date", "Conflict"
+ };
@@ -1214,7 +1214,7 @@
{
UStr uppath, filename;
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_AboutDlg.cpp 2007-11-13 22:59:36.000000000 +0100
@@ -0,0 +1,16 @@
+--- common/AboutDlg.cpp.orig 2007-11-13 22:57:56.000000000 +0100
++++ common/AboutDlg.cpp 2007-11-13 22:59:13.000000000 +0100
+@@ -290,11 +290,11 @@
+ void AboutDialog(void)
+ {
+ void *wid = UCreate_AboutDlg();
+- UStr appText = UCvsApp::gApp->GetAppName();
++ const UStr appText = UCvsApp::gApp->GetAppName();
+
+ UAboutDlg *dlg = new UAboutDlg ();
+ UEventSendMessage(dlg->GetWidID(), EV_INIT_WIDGET, kUMainWidget, wid);
+- UEventSendMessage(dlg->GetWidID(), EV_SETTEXT, kUMainWidget, appText);
++ UEventSendMessage(dlg->GetWidID(), EV_SETTEXT, kUMainWidget, (const char *)appText);
+
+ bool res = false;
+
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_AppGlue.h 2007-11-13 22:36:48.000000000 +0100
@@ -0,0 +1,13 @@
+--- common/AppGlue.h.orig 2007-11-13 22:34:29.000000000 +0100
++++ common/AppGlue.h 2007-11-13 22:34:36.000000000 +0100
+@@ -30,8 +30,8 @@
+ class CCvsConsole
+ {
+ public:
+- virtual long cvs_out(char *txt, long len) = 0L;
+- virtual long cvs_err(char *txt, long len) = 0L;
++ virtual long cvs_out(char *txt, long len) = 0;
++ virtual long cvs_err(char *txt, long len) = 0;
+ };
+
+ #define errInternal -99
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_ImportDlg.cpp 2007-11-13 22:49:11.000000000 +0100
@@ -0,0 +1,26 @@
+--- common/ImportDlg.cpp.orig 2007-11-13 22:38:26.000000000 +0100
++++ common/ImportDlg.cpp 2007-11-13 22:49:01.000000000 +0100
+@@ -51,20 +51,20 @@
+ #include "PromptFiles.h"
+ #include "TextBinary.h"
+
+-static char *sDefReleases[] =
++static const char * const sDefReleases[] =
+ {
+ "V10",
+ "V101",
+ 0L
+ };
+
+-static char *sDefVendors[] =
++static const char * const sDefVendors[] =
+ {
+ "GNU",
+ 0L
+ };
+
+-static char *sDefModuleNames[] =
++static const char * const sDefModuleNames[] =
+ {
+ "Module",
+ "Project",
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_ImportFilterDlg.cpp 2007-11-13 22:55:01.000000000 +0100
@@ -0,0 +1,11 @@
+--- common/ImportFilterDlg.cpp.orig 2007-11-13 22:52:32.000000000 +0100
++++ common/ImportFilterDlg.cpp 2007-11-13 22:53:30.000000000 +0100
+@@ -892,7 +892,7 @@
+
+ #define NUM_COLUMNS 3
+
+-static char *_gszColumnLabel[NUM_COLUMNS] =
++static const char *_gszColumnLabel[NUM_COLUMNS] =
+ {
+ "Entry state", "Entry description", "Entry kind"
+ };
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_LineCmd.cpp 2007-11-13 23:00:42.000000000 +0100
@@ -0,0 +1,11 @@
+--- common/LineCmd.cpp.orig 2007-11-13 23:00:05.000000000 +0100
++++ common/LineCmd.cpp 2007-11-13 23:00:24.000000000 +0100
+@@ -49,7 +49,7 @@
+ # include "UCvsDialogs.h"
+ #endif
+
+-char *sDefPrevCvsCmd[] =
++const char *sDefPrevCvsCmd[] =
+ {
+ "cvs --help-options",
+ "cvs --help-commands",
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_LogDlg.cpp 2007-11-13 23:55:25.000000000 +0100
@@ -0,0 +1,38 @@
+--- common/LogDlg.cpp.orig 2007-11-13 23:54:34.000000000 +0100
++++ common/LogDlg.cpp 2007-11-13 23:54:59.000000000 +0100
+@@ -57,7 +57,7 @@
+ #include "CvsPrefs.h"
+ #include "MultiString.h"
+
+-char *sDefLogTagNames[] =
++const char *sDefLogTagNames[] =
+ {
+ "1.32:1.35",
+ "1.32:",
+@@ -67,7 +67,7 @@
+ 0L
+ };
+
+-char *sDefLogDateNames[] =
++const char *sDefLogDateNames[] =
+ {
+ ">1998-3-24",
+ "<1998-1-24",
+@@ -76,7 +76,7 @@
+ 0L
+ };
+
+-char *sDefLogStateNames[] =
++const char *sDefLogStateNames[] =
+ {
+ "mystate",
+ "dead",
+@@ -85,7 +85,7 @@
+ 0L
+ };
+
+-char *sDefLogUserNames[] =
++const char *sDefLogUserNames[] =
+ {
+ "johna",
+ "garyb",
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_MultiString.cpp 2007-11-13 23:07:53.000000000 +0100
@@ -0,0 +1,11 @@
+--- common/MultiString.cpp.orig 2007-11-13 23:07:12.000000000 +0100
++++ common/MultiString.cpp 2007-11-13 23:07:34.000000000 +0100
+@@ -40,7 +40,7 @@
+ #endif /* WIN32 */
+
+ template<class T>
+-TMString<T>::TMString(unsigned int maxstr, const char *uniqueName, char * const *defaultStr,
++TMString<T>::TMString(unsigned int maxstr, const char *uniqueName, const char * const *defaultStr,
+ kClassPersistent pclass) : CPersistent(uniqueName, pclass), fMaxStr(maxstr)
+ {
+ if(defaultStr != 0L)
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_MultiString.h 2007-11-13 22:50:30.000000000 +0100
@@ -0,0 +1,20 @@
+--- common/MultiString.h.orig 2007-11-13 22:48:04.000000000 +0100
++++ common/MultiString.h 2007-11-13 22:50:02.000000000 +0100
+@@ -95,7 +95,7 @@
+ typedef NAMESPACE(std) vector<T> list_t;
+
+ TMString(unsigned int maxstr, const char *uniqueName,
+- char * const *defaultStr = 0L, kClassPersistent pclass = kNoClass);
++ const char * const *defaultStr = NULL, kClassPersistent pclass = kNoClass);
+ // defaultStr is a null terminated set of strings
+
+ virtual ~TMString();
+@@ -134,7 +134,7 @@
+ UDECLARE_DYNAMIC(CMString)
+ public:
+ CMString(unsigned int maxstr, const char *uniqueName,
+- char * const *defaultStr = 0L, kClassPersistent pclass = kNoClass) :
++ const char * const *defaultStr = NULL, kClassPersistent pclass = kNoClass) :
+ TMString<CStr>(maxstr, uniqueName, defaultStr, pclass)
+ {
+ }
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_Persistent.h 2007-11-13 22:34:06.000000000 +0100
@@ -0,0 +1,15 @@
+--- common/Persistent.h.orig 2007-11-13 22:33:34.000000000 +0100
++++ common/Persistent.h 2007-11-13 22:33:49.000000000 +0100
+@@ -47,9 +47,9 @@
+ CPersistent(const char *uniqueName, kClassPersistent pclass);
+ virtual ~CPersistent();
+
+- virtual unsigned int SizeOf(void) const = 0L;
+- virtual const void *GetData(void) const = 0L;
+- virtual void SetData(const void *ptr, unsigned int size) = 0L;
++ virtual unsigned int SizeOf(void) const = 0;
++ virtual const void *GetData(void) const = 0;
++ virtual void SetData(const void *ptr, unsigned int size) = 0;
+ // virtual access
+
+ static void SaveAll(void);
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_UpdateDlg.cpp 2007-11-13 23:57:04.000000000 +0100
@@ -0,0 +1,29 @@
+--- common/UpdateDlg.cpp.orig 2007-11-13 23:56:27.000000000 +0100
++++ common/UpdateDlg.cpp 2007-11-13 23:56:46.000000000 +0100
+@@ -56,7 +56,7 @@
+ # endif
+ #endif /* WIN32 */
+
+-char *sDefTagNames[] =
++const char *sDefTagNames[] =
+ {
+ "1.1",
+ "1.6.2.4",
+@@ -65,7 +65,7 @@
+ 0L
+ };
+
+-char *sDefDateNames[] =
++const char *sDefDateNames[] =
+ {
+ "1998-3",
+ "1998-3-24",
+@@ -76,7 +76,7 @@
+ 0L
+ };
+
+-char *sDefRevDateNames[] =
++const char *sDefRevDateNames[] =
+ {
+ "1.1",
+ "1.6.2.4",
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-common_getopt.c 2007-11-13 23:34:45.000000000 +0100
@@ -0,0 +1,11 @@
+--- common/getopt.c.orig 2007-11-13 23:33:47.000000000 +0100
++++ common/getopt.c 2007-11-13 23:34:27.000000000 +0100
+@@ -509,7 +509,7 @@
+ const struct option *pfound = NULL;
+ int exact = 0;
+ int ambig = 0;
+- int indfound;
++ int indfound = 0;
+ int option_index;
+
+ for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-rf_uevent.cpp 2007-11-14 00:05:16.000000000 +0100
@@ -0,0 +1,59 @@
+--- rf/uevent.cpp.orig 2007-11-13 23:59:55.000000000 +0100
++++ rf/uevent.cpp 2007-11-14 00:04:31.000000000 +0100
+@@ -196,7 +196,7 @@
+ int(UCmdTarget::*pfni_VP)(void *);
+ };
+
+-int UEventSendMessage(int wid, int/*UEventType*/ evt, int arg1, void *arg2)
++int UEventSendMessage(int wid, int/*UEventType*/ evt, int arg1, const void *arg2)
+ {
+ if(sTurnOffDispatching)
+ return 0;
+@@ -320,7 +320,7 @@
+ targets.erase(i);
+ }
+
+-int UCmdTarget::UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
++int UCmdTarget::UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
+ {
+ const UMSGMAP* themap;
+ const UMSGMAP_ENTRY *entries;
+@@ -357,13 +357,13 @@
+ (this->*mmf.pfnV_V)();
+ break;
+ case epV_VP:
+- (this->*mmf.pfnV_VP)(arg2);
++ (this->*mmf.pfnV_VP)((void *)arg2);
+ break;
+ case epV_iVP:
+- (this->*mmf.pfnV_iVP)(arg1, arg2);
++ (this->*mmf.pfnV_iVP)(arg1, (void *)arg2);
+ break;
+ case epV_IVP:
+- (this->*mmf.pfnV_iVP)(UHIWORD(arg1), arg2);
++ (this->*mmf.pfnV_iVP)(UHIWORD(arg1), (void *)arg2);
+ break;
+ case epV_i:
+ (this->*mmf.pfnV_i)(arg1);
+@@ -378,7 +378,7 @@
+ (this->*mmf.pfnV_iii)(ULOWORD(arg1), UHIWORD(arg1), (int)arg2);
+ break;
+ case epV_iiVP:
+- (this->*mmf.pfnV_iiVP)(ULOWORD(arg1), UHIWORD(arg1), arg2);
++ (this->*mmf.pfnV_iiVP)(ULOWORD(arg1), UHIWORD(arg1), (void *)arg2);
+ break;
+ case epi_ii:
+ res = (this->*mmf.pfni_ii)(ULOWORD(arg1), UHIWORD(arg1));
+@@ -390,10 +390,10 @@
+ res = (this->*mmf.pfni_V)();
+ break;
+ case epi_iVP:
+- res = (this->*mmf.pfni_iVP)(arg1, arg2);
++ res = (this->*mmf.pfni_iVP)(arg1, (void *)arg2);
+ break;
+ case epi_VP:
+- res = (this->*mmf.pfni_VP)(arg2);
++ res = (this->*mmf.pfni_VP)((void *)arg2);
+ break;
+ default:
+ UAppConsole("Unknown event cast : %d\n", entries->nSig);
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-rf_umain.h 2007-11-14 00:03:15.000000000 +0100
@@ -0,0 +1,20 @@
+--- rf/umain.h.orig 2002-01-02 17:46:33.000000000 +0100
++++ rf/umain.h 2007-11-14 00:02:57.000000000 +0100
+@@ -690,7 +690,7 @@
+ } UDispatchInfo;
+
+ //! dispatch an event using the static message table.
+- virtual int UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo);
++ virtual int UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo);
+
+ inline int GetWidID(void) const { return m_widid; }
+ private:
+@@ -969,7 +969,7 @@
+ extern "C" {
+ #endif
+
+-UEXPORT int UEventSendMessage(int wid, int/*UEventType*/ evt, int arg1, void *arg2);
++UEXPORT int UEventSendMessage(int wid, int/*UEventType*/ evt, int arg1, const void *arg2);
+ /* send a message to a pseudo-widget */
+
+ UEXPORT int UEventSendMessageExt(int wid, int/*UEventType*/ evt, int arg1, void *arg2, int * handledFlag);
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-rf_ustr.cpp 2007-11-13 23:47:08.000000000 +0100
@@ -0,0 +1,10 @@
+--- rf/ustr.cpp.orig 2007-11-13 23:46:12.000000000 +0100
++++ rf/ustr.cpp 2007-11-13 23:46:29.000000000 +0100
+@@ -428,4 +428,5 @@
+ newvalue[len] = '\0';
+
+ return newvalue;
+-}
+\ No newline at end of file
++}
++
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-rf_ustr.h 2007-11-13 22:33:10.000000000 +0100
@@ -0,0 +1,20 @@
+--- rf/ustr.h.orig 2007-11-13 22:31:20.000000000 +0100
++++ rf/ustr.h 2007-11-13 22:32:08.000000000 +0100
+@@ -175,13 +175,13 @@
+ //! concatenate
+ UStr & operator<<(int addToStr);
+ //! concatenate
+- UStr & UStr::operator+=(int addToStr);
++ UStr & operator+=(int addToStr);
+ //! concatenate
+- UStr & UStr::operator+=(char *addToStr);
++ UStr & operator+=(char *addToStr);
+ //! concatenate
+- UStr & UStr::operator+=(const char *addToStr);
++ UStr & operator+=(const char *addToStr);
+ //! concatenate
+- UStr & UStr::operator+=(const UStr & addToStr);
++ UStr & operator+=(const UStr & addToStr);
+
+ //! compare
+ inline int compare(const char *thestr) const { return strcmp(*this, thestr); }
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-rf_utoolbar.cpp 2007-11-14 00:09:31.000000000 +0100
@@ -0,0 +1,28 @@
+--- rf/utoolbar.cpp.orig 2002-06-15 19:49:37.000000000 +0200
++++ rf/utoolbar.cpp 2007-11-14 00:09:12.000000000 +0100
+@@ -736,14 +736,14 @@
+ delete m_winInfo;
+ }
+
+-int UToolbar::UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
++int UToolbar::UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
+ {
+ if(evt == EV_CMD)
+ {
+ WININFO *info = m_winInfo;
+ if(info != 0L)
+ {
+- int index;
++ int index = 0;
+ std::vector<TbEntry *>::iterator f = info->Search(arg1, &index);
+ if(f != info->entries.end())
+ {
+@@ -772,7 +772,7 @@
+ if(info == 0L)
+ return;
+
+- int index;
++ int index = 0;
+ std::vector<TbEntry *>::iterator f = info->Search(cmd, &index);
+ if(f == info->entries.end())
+ return;
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-rf_utoolbar.h 2007-11-14 00:07:30.000000000 +0100
@@ -0,0 +1,11 @@
+--- rf/utoolbar.h.orig 2007-11-14 00:07:09.000000000 +0100
++++ rf/utoolbar.h 2007-11-14 00:07:18.000000000 +0100
+@@ -85,7 +85,7 @@
+ UToolbar(int widid);
+ virtual ~UToolbar();
+
+- virtual int UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo);
++ virtual int UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo);
+
+ protected:
+ ev_msg void OnDestroy();
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-rf_uwidget.cpp 2007-11-13 23:31:39.000000000 +0100
@@ -0,0 +1,24 @@
+--- rf/uwidget.cpp.orig 2007-11-13 23:26:42.000000000 +0100
++++ rf/uwidget.cpp 2007-11-13 23:30:47.000000000 +0100
+@@ -782,7 +782,7 @@
+ m_listeners.push_back(listener);
+ }
+
+-int UWidget::UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo)
++int UWidget::UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo)
+ {
+ std::vector<UCmdTarget *>::iterator i;
+ for(i = m_listeners.begin(); i != m_listeners.end(); ++i)
+@@ -3136,10 +3136,10 @@
+ if(!GTK_IS_CLIST(w))
+ return;
+
+- gchar *emptyTxts[] = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
++ const gchar *emptyTxts[] = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
+
+ GtkCList *list = GTK_CLIST(w);
+- *num = gtk_clist_append (list, emptyTxts);
++ *num = gtk_clist_append (list, (gchar **)emptyTxts);
+ #endif
+ #if qMacAPP
+ TView *view = (TView *)w;
--- /dev/null 2007-11-14 00:12:31.000000000 +0100
+++ files/patch-rf_uwidget.h 2007-11-13 23:20:30.000000000 +0100
@@ -0,0 +1,11 @@
+--- rf/uwidget.h.orig 2007-11-13 23:19:17.000000000 +0100
++++ rf/uwidget.h 2007-11-13 23:19:38.000000000 +0100
+@@ -119,7 +119,7 @@
+ virtual void AddListener(UCmdTarget * listener);
+
+ //! this is overided in order to broadcast to the listeners
+- virtual int UDispatchMessage(int/*UEventType*/ evt, int arg1, void *arg2, UDispatchInfo & dispatchInfo);
++ virtual int UDispatchMessage(int/*UEventType*/ evt, int arg1, const void *arg2, UDispatchInfo & dispatchInfo);
+
+ //! return a sub-widget as inserted by EV_INIT_WIDGET
+ //! \arg \c cmd the sub-widget identifier.
--- files/patch-cvsunix-configure.in.orig 2006-11-22 21:38:47.000000000 +0100
+++ files/patch-cvsunix-configure.in 2007-11-14 00:26:13.000000000 +0100
@@ -1,5 +1,5 @@
---- cvsunix/configure.in.orig Wed Nov 22 16:09:07 2006
-+++ cvsunix/configure.in Wed Nov 22 16:10:02 2006
+--- cvsunix/configure.in.orig 2001-03-06 20:23:49.000000000 +0100
++++ cvsunix/configure.in 2007-11-14 00:25:06.000000000 +0100
@@ -178,7 +178,7 @@
# the user's setting for LDFLAGS
hold_ldflags=$LDFLAGS
@@ -9,7 +9,19 @@
LDFLAGS=$hold_ldflags
if test -n "$krb_incdir"; then
includeopt="${includeopt} -I$krb_incdir"
-@@ -212,7 +212,7 @@
+@@ -202,27 +202,22 @@
+
+ hold_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$GSSAPI/include "
+-AC_CHECK_HEADERS(krb5.h gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h)
++AC_CHECK_HEADERS(krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h)
+ CPPFLAGS=$hold_cppflags
+
+ if test "$ac_cv_header_krb5_h" = "yes" &&
+- (test "$ac_cv_header_gssapi_h" = "yes" ||
+- test "$ac_cv_header_gssapi_gssapi_h" = "yes"); then
++ test "$ac_cv_header_gssapi_gssapi_h" = "yes"; then
+ AC_DEFINE(HAVE_GSSAPI)
includeopt="${includeopt} -I$GSSAPI/include"
# FIXME: This is ugly, but these things don't seem to be standardized.
if test "$ac_cv_header_gssapi_h" = "yes"; then
@@ -18,3 +30,14 @@
else
LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
fi
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="-I$GSSAPI/include $CPPFLAGS"
+- if test "$ac_cv_header_gssapi_h" = "yes"; then
+- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
+- else
+- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
+- fi
++ AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE))
+ CPPFLAGS=$save_CPPFLAGS
+ # This is necessary on Irix 5.3, in order to link against libkrb5 --
+ # there, an_to_ln.o refers to things defined only in -lgen.
--- _gcvs.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1194997057.68964>