Revisions for new target libraries

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@849 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/Makefile.am b/Makefile.am
index 7fdd976..91356b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,5 +22,5 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 SUBDIRS = $(WANT_SUBDIRS)
 
 DIST_SUBDIRS = doc oncrpc shib schemas configs shib-target shar test \
-       mod_shire mod_shibrm apache-2.0 siterefresh shib-mysql-ccache \
+       mod_shire apache-2.0 siterefresh shib-mysql-ccache \
        xmlproviders

diff --git a/Shibboleth.dsw b/Shibboleth.dsw
index 86a8bd1..cc55eb2 100644 (file)
--- a/Shibboleth.dsw
+++ b/Shibboleth.dsw
@@ -11,29 +11,17 @@ Package=<5>
 
 Package=<4>
 {{{
-}}}
-
-###############################################################################
-
-Project: "isapi_shib"=.\isapi_shib\isapi_shib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
     Begin Project Dependency
-    Project_Dep_Name shib
+    Project_Dep_Name shibtarget
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name shibtarget
+    Project_Dep_Name shib
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_shibrm"=.\mod_shibrm\mod_shibrm.dsp - Package Owner=<4>
+Project: "isapi_shib"=.\isapi_shib\isapi_shib.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -42,10 +30,10 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name shibtarget
+    Project_Dep_Name shib
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name shib
+    Project_Dep_Name shibtarget
     End Project Dependency
 }}}
 
@@ -235,6 +223,10 @@ Global:
 
 Package=<5>
 {{{
+    begin source code control
+    "$/NSAPI", WNAAAAAA
+    ..\..\..\documents and settings\cantor.2.saidin\my documents\visual studio projects\nsapi
+    end source code control
 }}}
 
 Package=<3>

diff --git a/config_win32.h b/config_win32.h
index e7e8be9..790844a 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -67,6 +67,9 @@
 /* Define to 1 if you have the `strtok_r' function. */
 /* #undef HAVE_STRTOK_R */
 
+/* Define to 1 if you have the `strerror_r' function. */
+/* #undef HAVE_STRERROR_R */
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 

diff --git a/configure.ac b/configure.ac
index 9da56ee..17f5cc7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,7 @@ AC_STRUCT_TM
 
 # Checks for library functions.
 AC_FUNC_STRFTIME
+AC_FUNC_STRERROR_R
 AC_CHECK_FUNCS([strchr strdup strstr gmtime_r strtok_r strcasecmp])
 AC_CHECK_HEADERS([dlfcn.h])
 
@@ -368,7 +369,7 @@ dnl    LIBS="$saved_LIBS"
     WANT_SUBDIRS="$WANT_SUBDIRS mod_shire mod_shibrm"
 fi
 # always output the Makefile, even if we don't use it
-AC_CONFIG_FILES([mod_shire/Makefile mod_shibrm/Makefile])
+AC_CONFIG_FILES([mod_shire/Makefile])
 AM_CONDITIONAL(HAVE_APXS,test -n "$APXS")
 AM_CONDITIONAL(DO_APXS_INSTALL,test -n "$APXS_INSTALL")