Changeset 2276 for trunk

Timestamp:

2001-04-04T10:55:49+12:00 (23 years ago)

Author:

jrm21

Message:

changes to include the right header files, and toplevel config.h

Location:

trunk/gsdl/src/getpw

Files:

• Makefile.in (modified) (3 diffs)
• getpw.cpp (modified) (1 diff)

trunk/gsdl/src/getpw/Makefile.in

@@ -27 +27 @@
 AR = ar
 CC = @CC@
-CCFLAGS = -Wall @CFLAGS@ 
+CFLAGS = @CFLAGS@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@ 
 DEFS = @DEFS@
 RANLIB = @RANLIB@
-INCLUDES =
+# need to include config.h
+INCLUDES = -I../..
 LDFLAGS = @LDFLAGS@
 DPLIBS = 
@@ -37 +40 @@
 
  
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
-LINK = $(CC) $(LDFLAGS) -o $@
+LINK = $(CXX) $(LDFLAGS) -o $@
  
 .SUFFIXES:
 .SUFFIXES: .c .o
 .c.o:
-    $(COMPILE) $<
+    $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS) $<
 
 .SUFFIXES: .cpp .o
 .cpp.o:
-    $(COMPILE) $< 
- 
+    $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS) $< 
 
 HEADERS = 
@@ -80 +81 @@
 getpw: $(GETPW_OBJS) $(DPLIBS)
     $(LINK) $(GETPW_OBJS) $(LIBS) 
+

trunk/gsdl/src/getpw/getpw.cpp

@@ -28 +28 @@
 #include "crypt.h"
 #else
+
+#define _XOPEN_SOURCE 1
+/* following is for solaris */
+#define _XOPEN_SOURCE_EXTENDED 1
+
+#include "config.h"
 #if defined(HAVE_CRYPT_H)
 #include <crypt.h>
-#else 
-#define _XOPEN_SOURCE 1
+#endif
+
+#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-#endif
+/* we are probably in trouble if we have neither crypt.h or unistd.h,
+   but for now we'll do nothing about it... */
+
+#endif  /* not WIN32 */
 
 #if defined(GSDL_USE_OBJECTSPACE)